From 57701ac966cb4a363ebd7dc22e346ebbe578a615 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 11:38:59 +0800
Subject: [PATCH] 1

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
index 5e53178..4365edb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
@@ -52,17 +52,7 @@
                 .add(shopCommissionStatisticsVO.getTotalSubordinateCommission())
                 .add(shopCommissionStatisticsVO.getTotalServiceCharge()));
 
-        IPage<ShopBalanceStatement> statementIPage = page(page, new LambdaQueryWrapper<ShopBalanceStatement>());
-        List<ShopBalanceStatement> records = statementIPage.getRecords();
-        List<Integer> shopIds = records.stream().map(ShopBalanceStatement::getShopId).collect(Collectors.toList());
-        List<Shop> shopList = shopService.listByIds(shopIds);
-        records.forEach(st -> {
-            shopList.stream().filter(shop -> shop.getId().equals(st.getShopId())).findFirst().ifPresent(shop -> {
-                st.setShopName(shop.getName());
-                st.setShopManagerName(shop.getShopManager());
-                st.setPhone(shop.getPhone());
-            });
-        });
+        IPage<ShopBalanceStatement> statementIPage = this.baseMapper.queryShopBalanceStatementPage(page, shopBalanceStatement);
         shopCommissionStatisticsVO.setStatementIPage(statementIPage);
         return shopCommissionStatisticsVO;
     }

--
Gitblit v1.7.1