岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-01-15 48c56a8b6be6183d220f46d417fdeb98521f0c20 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java


@@ -23,18 +23,23 @@


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


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


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;


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;


@@ -48,8 +53,10 @@


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.time.temporal.ChronoUnit;


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;


@@ -98,6 +105,12 @@


    private SysUserClient sysUserClient;


    @Resource


    private OrderClient orderClient;


    @Resource


    private ShopBalanceStatementClient shopBalanceStatementClient;


    @Resource


    private UserCancellationLogService userCancellationLogService;


    @Resource


    private BalanceChangeRecordService balanceChangeRecordService;






    @ResponseBody


@@ -125,6 +138,8 @@


    @PostMapping("/editAppUserById")


    public R<Void> editAppUserById(@RequestBody AppUser appUser) {


        appUserService.updateById(appUser);


        appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getId, appUser.getId())


                .set(AppUser::getLastShopTime, appUser.getLastShopTime()));


        return R.ok();




    }


@@ -207,8 +222,7 @@


        return R.ok(user);


    }




    @Resource


    private UserCancellationLogService userCancellationLogService;






    @ResponseBody


    @GetMapping("/unregis")


@@ -224,6 +238,14 @@


        userCancellationLogService.save(userCancellationLog);


        user.setStatus(3);


        appUserService.updateById(user);




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


                .eq(AppUser::getInviteUserId, userId));


        for (AppUser appUser : subUserList) {


            Long inviteUserId = user.getInviteUserId();


            appUser.setInviteUserId(inviteUserId);


        }


        appUserService.updateBatchById(subUserList);


        return R.ok();


    }




@@ -250,15 +272,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);


@@ -304,33 +365,53 @@


        if (user.getShopId() != null) {


            R<Shop> storeById = shopClient.getShopById(user.getShopId());


            if (storeById.getData() != null) {


                user.setShopName(storeById.getData().getName());


                Shop shop = storeById.getData();


                user.setShopName(shop.getName());


            }


        }


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


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


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


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


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


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


        Long count7 = appUserService.lambdaQuery().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")


@@ -449,8 +530,10 @@


        //获取在该本店下单的用户ids


        Integer objectId = sysUser.getObjectId();


        R<List<Order>> listR = remoteOrderGoodsClient.byShopId(objectId);


        for (Order datum : listR.getData()) {


            userIds.add(datum.getAppUserId());


        if (listR.getData()!=null){


            for (Order datum : listR.getData()) {


                userIds.add(datum.getAppUserId());


            }


        }


        IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageCurr, pageSize, appUser, objectId, userIds);


        return R.ok(appuserPage);


@@ -509,7 +592,11 @@


    @GetMapping("/select")


    @ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})


    public R<AppUser> select(String phone) {


        AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();


        AppUser byId = appUserService.lambdaQuery()


                .eq(AppUser::getPhone, phone)


                .eq(AppUser::getDelFlag,0)


                .eq(AppUser::getStatus,1)


                .one();


        if (byId == null) {


            return R.fail("搜索失败，手机号错误。");


        }


@@ -589,7 +676,7 @@


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


        byId.setBottomUsers(list);


        //消费总金额


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


        R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,sysUser.getObjectId());


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


        if (!CollectionUtils.isEmpty(orderList)){


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


@@ -637,7 +724,10 @@


    @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 = sysUser.getObjectId();


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


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




    }


@@ -683,14 +773,11 @@


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


        Integer shopId = null;


        Set<Long> userId = null;


        Set<Long> userIdT = null;


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


            shopId = data.getObjectId();


            userId = orderClient.getAppUserByShoppingShop(shopId).getData();


        }


        UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);


        UserStatistics userStatistics1 = appUserMapper.getUserStatistics(shopId, userIdT);


        userStatistics.setShopUser(userStatistics1.getShopUser());


        return R.ok(userStatistics);


    }




@@ -727,44 +814,98 @@


     */


    @GetMapping("/commissionDetail")


    @ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")


    public R<CommissionDetail> commissionDetail(CommissionDetail commissionDetail) {


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


    public R<CommissionDetail> commissionDetail(CommissionDetail cd) {


        if (cd.getStartTime() == null || cd.getEndTime() == null) {


            return R.fail("请选择时间");


        }


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


            return R.ok(new CommissionDetail());


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


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


        }


        BigDecimal totalCommission = BigDecimal.ZERO;


        BigDecimal totalServiceFee = BigDecimal.ZERO;


        BigDecimal totalUserCommission = BigDecimal.ZERO;


        Map<Integer, BigDecimal> vipCommissions = new HashMap<>();


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


        for (AppUser appUser : appUserList) {


            BigDecimal distributionAmount = Optional.ofNullable(appUser.getTotalDistributionAmount()).orElse(BigDecimal.ZERO);


            totalCommission = totalCommission.add(distributionAmount);


            Integer vipId = appUser.getVipId();


            if (vipId != null && vipId >= 1 && vipId <= 7) {


                vipCommissions.merge(vipId, distributionAmount, BigDecimal::add);




                String dateKey = appUser.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));




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


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


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


                List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()


                        .between(BalanceChangeRecord::getCreateTime, date, date.plusDays(1))


                        .eq(BalanceChangeRecord::getChangeType,4)


                        .eq(BalanceChangeRecord::getVipId, i));


                BigDecimal reduce = list.stream().map(BalanceChangeRecord::getChangeAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


                String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


                dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())


                        .merge(vipId, distributionAmount, BigDecimal::add);


                        .merge(i, reduce, BigDecimal::add);


            }




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


                R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, date);


                if (!CollectionUtils.isEmpty(r.getData())){


                    List<ShopBalanceStatement> list = r.getData();


                    BigDecimal reduce = list.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


                    String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


                    int type;


                    if (i == 1){


                        type = 8;


                    }else if (i == 2){


                        type = 9;


                    }else {


                        type = 10;


                    }


                    dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())


                            .merge(type, reduce, BigDecimal::add);


                }


            }


        });






        BigDecimal totalCommission = BigDecimal.ZERO;


        BigDecimal totalNormalCommission = BigDecimal.ZERO;




        BigDecimal totalGoldCommission = BigDecimal.ZERO;




        BigDecimal totalDiamondCommission = BigDecimal.ZERO;




        BigDecimal totalAgentCommission = BigDecimal.ZERO;




        BigDecimal totalSuperAgentCommission = BigDecimal.ZERO;




        BigDecimal totalTopAgentCommission = BigDecimal.ZERO;




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


            }


        }


        List<Shop> data = shopClient.getAllShop().getData();


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


            data = Arrays.asList(shopClient.getShopById(sysUser.getObjectId()).getData());


        }


        for (Shop shop : data) {


            totalServiceFee = totalServiceFee.add(shop.getServerGiveawayMoney());


            totalUserCommission = totalUserCommission.add(shop.getGiveawayMoney());




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


@@ -772,13 +913,14 @@


        commissionDetail.setTotalServiceFee(totalServiceFee);


        commissionDetail.setTotalUserCommission(totalUserCommission);




        commissionDetail.setTotalNormalCommission(vipCommissions.getOrDefault(1, BigDecimal.ZERO));


        commissionDetail.setTotalGoldCommission(vipCommissions.getOrDefault(2, BigDecimal.ZERO));


        commissionDetail.setTotalDiamondCommission(vipCommissions.getOrDefault(3, BigDecimal.ZERO));


        commissionDetail.setTotalAgentCommission(vipCommissions.getOrDefault(4, BigDecimal.ZERO));


        commissionDetail.setTotalSuperAgentCommission(vipCommissions.getOrDefault(5, BigDecimal.ZERO));


        commissionDetail.setTotalTopAgentCommission(vipCommissions.getOrDefault(6, BigDecimal.ZERO));


        commissionDetail.setTotalPartnerCommission(vipCommissions.getOrDefault(7, BigDecimal.ZERO));


        commissionDetail.setTotalNormalCommission(totalNormalCommission);


        commissionDetail.setTotalGoldCommission(totalGoldCommission);


        commissionDetail.setTotalDiamondCommission(totalDiamondCommission);


        commissionDetail.setTotalAgentCommission(totalAgentCommission);


        commissionDetail.setTotalSuperAgentCommission(totalSuperAgentCommission);


        commissionDetail.setTotalTopAgentCommission(totalTopAgentCommission);


        commissionDetail.setTotalPartnerCommission(totalPartnerCommission);






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


                .map(entry -> {


@@ -795,14 +937,38 @@


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


    }


    






    /**


     * 获取指定时间段内每一天的列表


     *


     * @param startDate 开始日期时间


     * @param endDate 结束日期时间


     * @return 包含每天日期时间的列表


     */


    private static List<LocalDateTime> getDatesBetween(LocalDateTime startDate, LocalDateTime endDate) {


        // 计算开始日期和结束日期之间的天数差（忽略时间部分）


        long daysBetween = ChronoUnit.DAYS.between(startDate.toLocalDate(), endDate.toLocalDate());




        // 使用Stream.iterate从开始日期开始迭代，每次增加一天，直到达到天数差+1


        return Stream.iterate(startDate, date -> date.plus(1, ChronoUnit.DAYS))


                .limit(daysBetween + 1)


                .collect(Collectors.toList());


    }






    


    /**


     * 上传图片


@@ -832,6 +998,17 @@


    


    


    /**


     * 检查会员降级


     * @param appUserId


     */


    @PostMapping("/app-user/vipDemotion")


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


        appUserService.vipDemotion(appUserId);


    }


    


    


    


    /**


     * 用户降级检测


     */


    @PostMapping("/demotionDetection")


@@ -847,7 +1024,8 @@


     */


    @PostMapping("/clearBindShop")


    public R clearBindShop(@RequestParam("shopId") Integer shopId){


        appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getShopId, shopId).set(AppUser::getShopId, null));


        appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getShopId, shopId).set(AppUser::getShopId, null)


                .set(AppUser::getUserType,1));


        return R.ok();


    }


}