Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-16 ccba16ed9eb3e77d1c90271e33302cc7686d5d98

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -530,9 +530,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, 9).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
        List<UserPoint> list3 = userPointService.lambdaQuery().eq(UserPoint::getType, 8).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, 9).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;
@@ -555,9 +555,17 @@
    @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);
        appUserService.updateById(appUser);
        return R.ok();
    }

@@ -657,7 +665,7 @@
        List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
        byId.setBottomUsers(list);
        //消费总金额
        R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,sysUser.getObjectId());
        R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,byId.getShopId());
        List<Order> orderList = orderR.getData();
        if (!CollectionUtils.isEmpty(orderList)){
            BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -838,6 +846,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;

@@ -853,47 +870,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);
@@ -901,31 +921,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);