From 9834270f97f63dd46cb4aa845cd6b63f1c9382a7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 11:41:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java | 14 +-------------
1 files changed, 1 insertions(+), 13 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 518d360..9e265b5 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
@@ -53,19 +53,7 @@
.add(shopCommissionStatisticsVO.getTotalSubordinateCommission())
.add(shopCommissionStatisticsVO.getTotalServiceCharge()));
- IPage<ShopBalanceStatement> statementIPage = page(page, new LambdaQueryWrapper<ShopBalanceStatement>());
- List<ShopBalanceStatement> records = statementIPage.getRecords();
- if (!CollectionUtils.isEmpty(records)){
- 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