From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
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 ac1f16a..e586a1f 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
@@ -18,6 +18,8 @@
import com.ruoyi.order.vo.OrderSaleNum;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.mapper.ShopBalanceStatementCopyMapper;
+import com.ruoyi.other.mapper.ShopGiveawayTemporaryMapper;
import com.ruoyi.other.mapper.ShopMapper;
import com.ruoyi.other.service.*;
import com.ruoyi.other.util.GeodesyUtil;
@@ -89,6 +91,9 @@
private TechnicianService technicianService;
@Resource
private ReceiverBankChannelService receiverBankChannelService;
+
+ @Resource
+ private ShopGiveawayTemporaryMapper shopGiveawayTemporaryMapper;
@@ -408,6 +413,10 @@
return R.ok();
}
+ public static void main(String[] args) {
+ System.out.println("17780483325".substring(5));
+ }
+
@PutMapping("/freezingOrThawing")
@ApiOperation(value = "门店管理-冻结/解冻门店", tags = {"管理后台-门店管理"})
@@ -698,35 +707,20 @@
@ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
- List<Integer> shopIds;
-
- shopIds = shopService.list(new LambdaQueryWrapper<Shop>()
- .eq(Shop::getDelFlag, 0)
- .eq(shopId !=null,Shop::getId, shopId))
- .stream()
- .map(Shop::getId)
- .collect(Collectors.toList());
-
-
- if (CollectionUtils.isEmpty(shopIds)){
- shopStatistics.setTotalOrder(0);
- shopStatistics.setServiceOrder(0);
- shopStatistics.setGoodsOrder(0);
- }else {
- OrderSaleNum serviceOrderSaleNum = new OrderSaleNum();
- serviceOrderSaleNum.setShopIds(shopIds);
- serviceOrderSaleNum.setType(1);
- Integer serviceOrder = orderClient.getShopSaleNumByShopIds(serviceOrderSaleNum).getData();
-
- OrderSaleNum goodsOrderSaleNum = new OrderSaleNum();
- goodsOrderSaleNum.setShopIds(shopIds);
- goodsOrderSaleNum.setType(2);
- Integer goodsOrder = orderClient.getShopSaleNumByShopIds(goodsOrderSaleNum).getData();
-
- shopStatistics.setTotalOrder(serviceOrder + goodsOrder);
- shopStatistics.setServiceOrder(serviceOrder);
- shopStatistics.setGoodsOrder(goodsOrder);
- }
+
+ OrderSaleNum serviceOrderSaleNum = new OrderSaleNum();
+ serviceOrderSaleNum.setShopIds(null == shopId ? new ArrayList<>() : Arrays.asList(shopId));
+ serviceOrderSaleNum.setType(1);
+ Integer serviceOrder = orderClient.getShopSaleNumByShopIds(serviceOrderSaleNum).getData();
+
+ OrderSaleNum goodsOrderSaleNum = new OrderSaleNum();
+ goodsOrderSaleNum.setShopIds(null == shopId ? new ArrayList<>() : Arrays.asList(shopId));
+ goodsOrderSaleNum.setType(2);
+ Integer goodsOrder = orderClient.getShopSaleNumByShopIds(goodsOrderSaleNum).getData();
+
+ shopStatistics.setTotalOrder(serviceOrder + goodsOrder);
+ shopStatistics.setServiceOrder(serviceOrder);
+ shopStatistics.setGoodsOrder(goodsOrder);
return R.ok(shopStatistics);
}
@@ -894,8 +888,17 @@
BigDecimal giveawayMoney = BigDecimal.ZERO;
for (Shop shop : shopList) {
serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
- giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney());
+ giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
}
+ LambdaQueryWrapper<ShopGiveawayTemporary> wrapper = new LambdaQueryWrapper<>();
+ if(null != shopId && 0 != shopId){
+ wrapper.eq(ShopGiveawayTemporary::getShopId, shopId);
+ }
+ List<ShopGiveawayTemporary> list = shopGiveawayTemporaryMapper.selectList(wrapper);
+ BigDecimal reduce = list.stream().map(ShopGiveawayTemporary::getServerGiveawayMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ serverGiveawayMoney = serverGiveawayMoney.add(reduce);
+ BigDecimal reduce1 = list.stream().map(ShopGiveawayTemporary::getGiveawayMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ giveawayMoney = giveawayMoney.add(reduce1);
Map<String, BigDecimal> map = new HashMap<>();
map.put("serverGiveawayMoney", serverGiveawayMoney);
map.put("giveawayMoney", giveawayMoney);
--
Gitblit v1.7.1