luodangjia
2025-02-08 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1054,11 +1054,9 @@
        Map<String, BigDecimal> data = shopStatistics.getData();
        BigDecimal totalServiceFee = BigDecimal.ZERO;
        BigDecimal totalUserCommission = BigDecimal.ZERO;
        BigDecimal lowerLevelGiveawayMoney = BigDecimal.ZERO;
        if (data != null){
            totalServiceFee = data.get("serverGiveawayMoney");
            totalUserCommission = data.get("giveawayMoney");
            lowerLevelGiveawayMoney = data.get("lowerLevelGiveawayMoney");
        }
        BigDecimal totalCommission = BigDecimal.ZERO;
@@ -1119,7 +1117,6 @@
        CommissionDetail commissionDetail = new CommissionDetail();
        commissionDetail.setTotalServiceFee(totalServiceFee);
        commissionDetail.setTotalUserCommission(totalUserCommission);
        commissionDetail.setLowerLevelGiveawayMoney(lowerLevelGiveawayMoney);
        commissionDetail.setTotalNormalCommission(totalNormalCommission);
        commissionDetail.setTotalGoldCommission(totalGoldCommission);
        commissionDetail.setTotalDiamondCommission(totalDiamondCommission);