From 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 08 二月 2025 13:36:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 3 ---
1 files changed, 0 insertions(+), 3 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 c228596..8e6f12c 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
@@ -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);
--
Gitblit v1.7.1