From 5d85a2636af741586312099a9022c99cdf5e4818 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 21:20:13 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 73d5d13..4a4b6eb 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.account.api.model.UserCancellationLog;
 import com.ruoyi.account.api.model.UserCoupon;
@@ -27,13 +28,18 @@
 import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
 import com.ruoyi.order.model.Order;
 import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
 import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.factory.ShopBalanceStatementClientFallbackFactory;
+import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
 import com.ruoyi.other.api.feignClient.ShopClient;
 import com.ruoyi.other.api.feignClient.StoreClient;
 import com.ruoyi.other.api.feignClient.VipSettingClient;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.feignClient.SysUserClient;
 import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -96,6 +102,8 @@
     private SysUserClient sysUserClient;
     @Resource
     private OrderClient orderClient;
+    @Resource
+    private ShopBalanceStatementClient shopBalanceStatementClient;
 
 
     @ResponseBody
@@ -518,6 +526,10 @@
     @ApiOperation(value = "用户列表-更换绑定人", tags = {"管理后台"})
     public R<AppUser> select(Long id, Long inviteId) {
         AppUser byId = appUserService.getById(id);
+        Long userId = byId.getId();
+        if (userId.equals(inviteId)) {
+            return R.fail("不能选择自己为绑定人。");
+        }
         byId.setInviteUserId(inviteId);
         byId.setTopInviteId(getTop(inviteId));
         appUserService.updateById(byId);
@@ -637,8 +649,8 @@
     }
 
 
-    @GetMapping("/listByIds")
-    List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
+    @PostMapping("/listByIds")
+    public List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
         if(ids.size() == 0){
             return new ArrayList<>();
         }
@@ -658,7 +670,7 @@
     /**
      * 设置指定用户的下级用户绑定门店
      */
-    @PutMapping("setLowerUserShop")
+    @PostMapping("/setLowerUserShop")
     public R<Void> setLowerUserShop(@RequestParam("userId") Long userId,@RequestParam("shopId") Integer shopId) {
         appUserService.update(new LambdaUpdateWrapper<AppUser>()
                 .set(AppUser::getShopId,shopId)
@@ -721,13 +733,17 @@
      */
     @GetMapping("/commissionDetail")
     @ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
-    public R<CommissionDetail> commissionDetail() {
+    public R<CommissionDetail> commissionDetail(CommissionDetail cd) {
         Long userid = tokenService.getLoginUser().getUserid();
         SysUser sysUser = sysUserClient.getSysUser(userid).getData();
         LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0);
         if(sysUser.getRoleType() == 2){
             queryWrapper.eq(AppUser::getShopId, sysUser.getObjectId());
         }
+        LocalDateTime startTime = cd.getStartTime();
+        LocalDateTime endTime = cd.getEndTime();
+        queryWrapper.ge(null != startTime, AppUser::getCreateTime, startTime);
+        queryWrapper.le(null != endTime, AppUser::getCreateTime, endTime);
         queryWrapper.orderByAsc(AppUser::getCreateTime);
         List<AppUser> appUserList = appUserService.list(queryWrapper);
         if (appUserList.isEmpty()) {
@@ -750,6 +766,8 @@
                         .merge(vipId, distributionAmount, BigDecimal::add);
             }
         }
+
+        // 门店分佣计算
         List<Shop> data = shopClient.getAllShop().getData();
         if(sysUser.getRoleType() == 2){
             data = Arrays.asList(shopClient.getShopById(sysUser.getObjectId()).getData());
@@ -758,6 +776,25 @@
             totalServiceFee = totalServiceFee.add(shop.getServerGiveawayMoney());
             totalUserCommission = totalUserCommission.add(shop.getGiveawayMoney());
         }
+
+        R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), null);
+        List<ShopBalanceStatement> data1 = r.getData();
+        if (!CollectionUtils.isEmpty(data1)){
+            for (ShopBalanceStatement shopBalanceStatement : data1) {
+                String dateKey = shopBalanceStatement.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                Integer type = shopBalanceStatement.getType();
+                if (type == 1){
+                    type = 8;
+                }else if (type == 2){
+                    type = 9;
+                }else {
+                    type = 10;
+                }
+                dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+                        .merge(type, shopBalanceStatement.getVariableAmount(), BigDecimal::add);
+            }
+        }
+
 
         CommissionDetail commissionDetail = new CommissionDetail();
         commissionDetail.setTotalCommission(totalCommission);
@@ -787,14 +824,21 @@
                     BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())
                             .add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());
                     commissionDate.setTotalCommission(add);
+
+                    commissionDate.setServiceChargeCommission(dailyCommissions.getOrDefault(10, BigDecimal.ZERO));
+                    commissionDate.setAssociatedUserCommission(dailyCommissions.getOrDefault(8, BigDecimal.ZERO));
+                    commissionDate.setBindLowerLevelStoresCommission(dailyCommissions.getOrDefault(9, BigDecimal.ZERO));
                     return commissionDate;
                 })
                 .collect(Collectors.toList());
 
+
+
+
         commissionDetail.setCommissionDateList(commissionDateList);
         return R.ok(commissionDetail);
     }
-    
+
     
     /**
      * 上传图片

--
Gitblit v1.7.1