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-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 5 +----
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 3 ---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java | 6 ------
3 files changed, 1 insertions(+), 13 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);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
index 598187f..a9b23be 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
@@ -33,12 +33,6 @@
private BigDecimal totalUserCommission;
/**
- * 绑定下级门店分佣
- */
- @ApiModelProperty(value = "绑定下级门店分佣")
- private BigDecimal lowerLevelGiveawayMoney;
-
- /**
* 普通会员获得总分佣金额
*/
@ApiModelProperty(value = "普通会员获得总分佣金额")
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 0cc3986..0a46602 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -825,22 +825,19 @@
@GetMapping("/getShopStatistics")
public R<Map<String, BigDecimal> > getShopStatistics(@RequestParam("shopId") Integer shopId){
LambdaQueryWrapper<Shop> queryWrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1);
- if(null != shopId){
+ if(null != shopId && 0 != shopId){
queryWrapper.eq(Shop::getId, shopId);
}
List<Shop> shopList = shopService.list(queryWrapper);
BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
BigDecimal giveawayMoney = BigDecimal.ZERO;
- BigDecimal lowerLevelGiveawayMoney = BigDecimal.ZERO;
for (Shop shop : shopList) {
serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney());
- lowerLevelGiveawayMoney = lowerLevelGiveawayMoney.add(shop.getLowerLevelGiveawayMoney());
}
Map<String, BigDecimal> map = new HashMap<>();
map.put("serverGiveawayMoney", serverGiveawayMoney);
map.put("giveawayMoney", giveawayMoney);
- map.put("lowerLevelGiveawayMoney", lowerLevelGiveawayMoney);
return R.ok(map);
}
--
Gitblit v1.7.1