岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
2025-01-26 20bf12dc209329b29ac96d01efabaa3a0ff30cb2 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java


@@ -1,29 +1,22 @@


package com.ruoyi.account.controller;






import com.alibaba.fastjson2.JSONObject;


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;


import com.ruoyi.account.api.model.UserSignRecord;


import com.ruoyi.account.mapper.AppUserMapper;


import com.ruoyi.account.service.AppUserService;


import com.ruoyi.account.service.UserCancellationLogService;


import com.ruoyi.account.service.UserCouponService;


import com.ruoyi.account.service.UserSignRecordService;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.account.api.model.*;


import com.ruoyi.account.dto.DangerInfoDto;


import com.ruoyi.account.mapper.AppUserMapper;


import com.ruoyi.account.service.*;


import com.ruoyi.account.util.ObsUploadUtil;


import com.ruoyi.account.vo.*;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.utils.bean.BeanUtils;


import com.ruoyi.common.core.web.controller.BaseController;


import com.ruoyi.common.core.web.page.PageInfo;


import com.ruoyi.common.redis.annotation.DistributedLock;


import com.ruoyi.common.security.service.TokenService;


import com.ruoyi.order.feignClient.OrderClient;


import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;


@@ -31,7 +24,6 @@


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;


@@ -39,13 +31,9 @@


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;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;




import javax.annotation.Resource;


import java.io.IOException;


@@ -57,12 +45,6 @@


import java.util.*;


import java.util.stream.Collectors;


import java.util.stream.Stream;




import com.ruoyi.account.vo.*;


import com.ruoyi.common.core.web.controller.BaseController;


import com.ruoyi.common.core.web.page.TableDataInfo;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;




/**


 * <p>


@@ -76,8 +58,7 @@


@RestController


@RequestMapping("/app-user")


public class AppUserController extends BaseController {






    


    @Resource


    private TokenService tokenService;


    @Resource


@@ -111,6 +92,8 @@


    private UserCancellationLogService userCancellationLogService;


    @Resource


    private BalanceChangeRecordService balanceChangeRecordService;


    @Resource


    private UserChangeLogService userChangeLogService;






    @ResponseBody


@@ -133,6 +116,17 @@


    public AppUser getAppUserById(@RequestParam("id") Long id) {


        return appUserService.getById(id);


    }




    @PostMapping("/getBaseUserById")


    public R<Map<String, Object>> getBaseUserById(@RequestParam("id") Long id) {


        AppUser appUser = appUserService.getById(id);


        Map<String, Object> map = new HashMap<>();


        map.put("id", appUser.getId());


        map.put("name", appUser.getName());


        map.put("phone", appUser.getPhone());


        return R.ok(map);


    }






    @ResponseBody


    @PostMapping("/editAppUserById")


@@ -272,15 +266,54 @@


            user.setTopUser(byId);


        }


        //获取绑定下级列表


        List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, user.getId()).list();


        List<AppUser> list = appUserService.lambdaQuery()


                .eq(AppUser::getInviteUserId, user.getId())


                .eq(AppUser::getDelFlag, 0)


                .ne(AppUser::getStatus, 3)


                .list();


        for (AppUser appUser : list) {


            Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, appUser.getId()).count();


            Long count1 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 1)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            Long count2 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 2)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            Long count3 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 3)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            Long count4 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 4)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            Long count5 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 5)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            Long count6 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 6)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            Long count7 = appUserService.lambdaQuery()


                    .eq(AppUser::getVipId, 7)


                    .eq(AppUser::getInviteUserId, appUser.getId())


                    .eq(AppUser::getDelFlag, 0)


                    .ne(AppUser::getStatus, 3)


                    .count();


            appUser.setCount1(count1);


            appUser.setCount2(count2);


            appUser.setCount3(count3);


@@ -330,30 +363,49 @@


                user.setShopName(shop.getName());


            }


        }


        Long count1 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        Long count2 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        Long count3 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        Long count4 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        Long count5 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        Long count6 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        Long count7 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


        user.setCount1(count1);


        user.setCount2(count2);


        user.setCount3(count3);


        user.setCount4(count4);


        user.setCount5(count5);


        user.setCount6(count6);


        user.setCount7(count7);


        List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()


                .ne(AppUser::getStatus, 3)


                .eq(AppUser::getDelFlag, 0));


        ArrayList<Long> userIds = new ArrayList<>();


        userIds.add(userId);


        getUserAncestorList(user,userIds,new ArrayList<>(),appUserList);


//        Long count1 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        Long count2 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        Long count3 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        Long count4 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        Long count5 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        Long count6 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        Long count7 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();


//        user.setCount1(count1);


//        user.setCount2(count2);


//        user.setCount3(count3);


//        user.setCount4(count4);


//        user.setCount5(count5);


//        user.setCount6(count6);


//        user.setCount7(count7);




        List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();


        List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now())


                .eq(UserSignRecord::getAppUserId,userId).list();


        if (!list.isEmpty()) {


            user.setIsSign(1);


        } else {


            user.setIsSign(0);


        }


        return R.ok(user);






    }


    public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {


        children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());


        if(!CollectionUtils.isEmpty(children)){


            user.setCount1((user.getCount1() == null ? 0L : user.getCount1()) + children.stream().filter(e->e.getVipId() == 1).count());


            user.setCount2((user.getCount2() == null ? 0L : user.getCount2()) + children.stream().filter(e->e.getVipId() == 2).count());


            user.setCount3((user.getCount3() == null ? 0L : user.getCount3()) + children.stream().filter(e->e.getVipId() == 3).count());


            user.setCount4((user.getCount4() == null ? 0L : user.getCount4()) + children.stream().filter(e->e.getVipId() == 4).count());


            user.setCount5((user.getCount5() == null ? 0L : user.getCount5()) + children.stream().filter(e->e.getVipId() == 5).count());


            user.setCount6((user.getCount6() == null ? 0L : user.getCount6()) + children.stream().filter(e->e.getVipId() == 6).count());


            user.setCount7((user.getCount7() == null ? 0L : user.getCount7()) + children.stream().filter(e->e.getVipId() == 7).count());


            List<Long> userIdList = children.stream().map(AppUser::getId).collect(Collectors.toList());


            getUserAncestorList(user,userIdList, children,list);


        }


    }




    @GetMapping("/index/change")


@@ -491,9 +543,9 @@


        VipSetting data = vipSetting.getData();


        DangerInfoDto dangerInfoDto = new DangerInfoDto();


        BeanUtils.copyProperties(data, dangerInfoDto);


        List<UserPoint> list1 = userPointService.lambdaQuery().eq(UserPoint::getType, 1).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();


        List<UserPoint> list2 = userPointService.lambdaQuery().eq(UserPoint::getType, 2).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();


        List<UserPoint> list3 = userPointService.lambdaQuery().eq(UserPoint::getType, 5).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();


        List<UserPoint> list1 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 1).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();


        List<UserPoint> list2 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 2).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();


        List<UserPoint> list3 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 8).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();


        Integer userKeepBuyPoint = 0;


        for (UserPoint userPoint : list1) {


            userKeepBuyPoint = userPoint.getVariablePoint() + userKeepBuyPoint;


@@ -516,9 +568,38 @@


    @GetMapping("/danger/down")


    @ApiOperation(value = "用户列表-保级条件降级", tags = {"管理后台"})


    public R down(Long id) {


        AppUser byId = appUserService.getById(id);


        byId.setVipId(byId.getVipId() - 1);


        appUserService.updateById(byId);


        AppUser appUser = appUserService.getById(id);


        UserChangeLog userChangeLog = new UserChangeLog();


        userChangeLog.setDelFlag(0);


        userChangeLog.setCreateTime(LocalDateTime.now());


        userChangeLog.setAppUserId(id);


        userChangeLog.setBeforeVipId(appUser.getVipId());


        userChangeLog.setAfterVipId(appUser.getVipId() - 1);


        userChangeLog.setChangeType(0);


        userChangeLogService.save(userChangeLog);


        appUser.setVipId(appUser.getVipId() - 1);


        appUser.setIsDanger(0);


        //检查是否达标，不达标继续标红


        VipSetting vipSetting = vipSettingClient.getVipSetting(appUser.getVipId()).getData();


        //消费积分


        List<UserPoint> list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 1).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepBuyDay() + " DAY) <= create_time"));


        int sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();


        if(sum < vipSetting.getKeepBuyPoint()){


            appUser.setIsDanger(1);


        }


        //返佣积分


        list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 2).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShareDay() + " DAY) <= create_time"));


        sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();


        if(sum < vipSetting.getKeepSharePoint()){


            appUser.setIsDanger(1);


        }


        //门店业绩


        list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 8).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShopDay() + " DAY) <= create_time"));


        sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();


        if(sum < vipSetting.getKeepShopPoint()){


            appUser.setIsDanger(1);


        }


        appUserService.updateById(appUser);


        return R.ok();


    }




@@ -584,8 +665,7 @@




    @GetMapping("/detail")


    @ApiOperation(value = "用户列表-详情", tags = {"管理后台"})


    public R<AppUser> detail(Long id) {




    public R<AppUser> detail(Long id, Integer shopId) {


        Long userid = tokenService.getLoginUser().getUserid();


        SysUser sysUser = sysUserClient.getSysUser(userid).getData();


        AppUser byId = appUserService.getById(id);


@@ -618,7 +698,13 @@


        List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();


        byId.setBottomUsers(list);


        //消费总金额


        R<List<Order>> orderR = remoteOrderGoodsClient.byShopId(sysUser.getObjectId());


        if(null == shopId || 1 == sysUser.getRoleType()){


            shopId = -1;


        }


        if(null == shopId && 2 == sysUser.getRoleType()){


            shopId = sysUser.getObjectId();


        }


        R<List<Order>> orderR = remoteOrderGoodsClient.byUserId(id, shopId);


        List<Order> orderList = orderR.getData();


        if (!CollectionUtils.isEmpty(orderList)){


            BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


@@ -629,8 +715,7 @@


        return R.ok(byId);


    }




    @Resource


    private UserChangeLogService userChangeLogService;


    




    @GetMapping("/change/vip")


    @ApiOperation(value = "用户列表-修改会员等级", tags = {"管理后台"})


@@ -666,7 +751,13 @@


    @GetMapping("/orders")


    @ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})


    public R<List<Order>> orders(Long id) {


        R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id);


        Long userid = tokenService.getLoginUser().getUserid();


        SysUser sysUser = sysUserClient.getSysUser(userid).getData();


        Integer shopId = -1;


        if(sysUser.getRoleType() == 2){


            shopId = sysUser.getObjectId();


        }


        R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id,shopId);


        return R.ok(listR.getData());




    }


@@ -760,8 +851,6 @@


        if (cd.getStartTime().isAfter(cd.getEndTime())) {


            return R.fail("开始时间不能大于结束时间");


        }






        Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();


        getDatesBetween(cd.getStartTime(), cd.getEndTime()).forEach(date -> {


            for (int i = 1; i < 8; i++){


@@ -796,6 +885,15 @@


        });






        R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics();


        Map<String, BigDecimal> data = shopStatistics.getData();


        BigDecimal totalServiceFee = BigDecimal.ZERO;


        BigDecimal totalUserCommission = BigDecimal.ZERO;


        if (data != null){


            totalServiceFee = data.get("serverGiveawayMoney");


            totalUserCommission = data.get("giveawayMoney");


        }




        BigDecimal totalCommission = BigDecimal.ZERO;


        BigDecimal totalNormalCommission = BigDecimal.ZERO;




@@ -811,47 +909,50 @@




        BigDecimal totalPartnerCommission = BigDecimal.ZERO;




        List<AppUser> allAppUserList = appUserService.list();


        for (AppUser appUser : allAppUserList) {


            BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();


            totalCommission = totalCommission.add(totalDistributionAmount);


            if (appUser.getVipId() == 1){


                totalNormalCommission = totalNormalCommission.add(totalDistributionAmount);


            }


            if (appUser.getVipId() == 2){


                totalGoldCommission = totalGoldCommission.add(totalDistributionAmount);


            }


            if (appUser.getVipId() == 3){


                totalDiamondCommission = totalDiamondCommission.add(totalDistributionAmount);


            }


            if (appUser.getVipId() == 4){


                totalAgentCommission = totalAgentCommission.add(totalDistributionAmount);


            }


            if (appUser.getVipId() == 5){


                totalSuperAgentCommission = totalSuperAgentCommission.add(totalDistributionAmount);


            }


            if (appUser.getVipId() == 6){


                totalTopAgentCommission = totalTopAgentCommission.add(totalDistributionAmount);


            }


            if (appUser.getVipId() == 7){


                totalPartnerCommission = totalPartnerCommission.add(totalDistributionAmount);


            }


        Set<String> keySet = dailyVipCommissions.keySet();


        List<CommissionDate> commissionDateList = new ArrayList<>();


        for (String key : keySet) {


            CommissionDate commissionDate = new CommissionDate();


            commissionDate.setDate(key);


            Map<Integer, BigDecimal> dailyCommissions = dailyVipCommissions.get(key);


            commissionDate.setNormalCommission(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));


            totalNormalCommission = totalNormalCommission.add(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));




            commissionDate.setGoldCommission(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));


            totalGoldCommission = totalGoldCommission.add(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));




            commissionDate.setDiamondCommission(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));


            totalDiamondCommission = totalDiamondCommission.add(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));




            commissionDate.setAgentCommission(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));


            totalAgentCommission = totalAgentCommission.add(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));




            commissionDate.setSuperAgentCommission(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));


            totalSuperAgentCommission = totalSuperAgentCommission.add(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));




            commissionDate.setTopAgentCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));


            totalTopAgentCommission = totalTopAgentCommission.add(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));




            commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));


            totalPartnerCommission = totalPartnerCommission.add(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));




            // 用户分销总金额




            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));


            commissionDateList.add(commissionDate);


        }




        R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics();


        Map<String, BigDecimal> data = shopStatistics.getData();


        BigDecimal totalServiceFee = BigDecimal.ZERO;


        BigDecimal totalUserCommission = BigDecimal.ZERO;


        if (data != null){


            totalServiceFee = data.get("serverGiveawayMoney");


            totalUserCommission = data.get("lowerLevelGiveawayMoney");


        }






        CommissionDetail commissionDetail = new CommissionDetail();


        commissionDetail.setTotalCommission(totalCommission);


        commissionDetail.setTotalServiceFee(totalServiceFee);


        commissionDetail.setTotalUserCommission(totalUserCommission);




        commissionDetail.setTotalNormalCommission(totalNormalCommission);


        commissionDetail.setTotalGoldCommission(totalGoldCommission);


        commissionDetail.setTotalDiamondCommission(totalDiamondCommission);


@@ -859,31 +960,9 @@


        commissionDetail.setTotalSuperAgentCommission(totalSuperAgentCommission);


        commissionDetail.setTotalTopAgentCommission(totalTopAgentCommission);


        commissionDetail.setTotalPartnerCommission(totalPartnerCommission);






        List<CommissionDate> commissionDateList = dailyVipCommissions.entrySet().stream()


                .map(entry -> {


                    CommissionDate commissionDate = new CommissionDate();


                    commissionDate.setDate(entry.getKey());


                    Map<Integer, BigDecimal> dailyCommissions = entry.getValue();


                    commissionDate.setNormalCommission(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));


                    commissionDate.setGoldCommission(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));


                    commissionDate.setDiamondCommission(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));


                    commissionDate.setAgentCommission(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));


                    commissionDate.setSuperAgentCommission(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));


                    commissionDate.setTopAgentCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));


                    commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));


                    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());




        totalCommission = totalNormalCommission.add(totalGoldCommission).add(totalDiamondCommission).add(totalAgentCommission)


                .add(totalSuperAgentCommission).add(totalTopAgentCommission).add(totalPartnerCommission);


        commissionDetail.setTotalCommission(totalCommission);


        commissionDetail.setCommissionDateList(commissionDateList);




        return R.ok(commissionDetail);


@@ -937,6 +1016,17 @@


    


    


    /**


     * 检查会员降级


     * @param appUserId


     */


    @PostMapping("/vipDemotion")


    public void vipDemotion(@RequestParam("appUserId") Long appUserId){


        appUserService.vipDemotion(appUserId);


    }


    


    


    


    /**


     * 用户降级检测


     */


    @PostMapping("/demotionDetection")