From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 55 ++++++-------------------------------------------------
1 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
index 33f6baf..021d8f8 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
@@ -62,18 +62,6 @@
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
shopBalanceStatement.setType(1);
- R<List<ShopBalanceStatement>> r;
- try {
- r = shopClient.getShopBalanceStatementList(shopBalanceStatement);
- } catch (Exception e) {
- log.error("获取店铺余额对账单列表时出错", e);
- return null;
- }
-
- if (R.isError(r)) {
- return null;
- }
-
List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>();
for (BalanceChangeRecord changeRecord : balanceChangeRecordList) {
@@ -82,24 +70,6 @@
walletStatisticsDetailList.add(walletStatisticsDetail);
}
- List<WalletStatisticsDetail> collect = r.getData().stream().map(this::createWalletStatisticsDetail).collect(Collectors.toList());
- // 根据门店名称、用户姓名、联系电话进行模糊过滤
- collect = collect.stream()
- .filter(e -> {
- if (StringUtils.isNotEmpty(balanceChangeRecord.getShopName())) {
- return e.getShopName().contains(balanceChangeRecord.getShopName());
- } else if (StringUtils.isNotEmpty(balanceChangeRecord.getUserName())) {
- return e.getUserName().contains(balanceChangeRecord.getUserName());
- } else if (StringUtils.isNotEmpty(balanceChangeRecord.getUserPhone())) {
- return e.getUserPhone().contains(balanceChangeRecord.getUserPhone());
- }
- // 根据时间进行范围过滤
- if (balanceChangeRecord.getStartTime() != null && balanceChangeRecord.getEndTime() != null) {
- return e.getCreateTime().isAfter(balanceChangeRecord.getStartTime()) && e.getCreateTime().isBefore(balanceChangeRecord.getEndTime());
- }
- return false;
- }).collect(Collectors.toList());
- walletStatisticsDetailList.addAll(collect);
// 按时间排序（倒序）
walletStatisticsDetailList.sort(Comparator.comparing(WalletStatisticsDetail::getCreateTime).reversed());
@@ -116,8 +86,6 @@
throw new ServiceException("页面参数无效");
}
- List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
-
Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
.collect(Collectors.groupingBy(
@@ -133,29 +101,18 @@
BigDecimal totalWithdraw = shopCommissionMap.get(2);
BigDecimal totalShopWithdraw = shopCommissionMap.get(7);
+ List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
WalletStatistics walletStatistics = new WalletStatistics();
- Page<WalletStatisticsDetail> page1 = new Page<>();
- page1.setRecords(walletStatisticsDetailList2);
- page1.setTotal(walletStatisticsDetailList.size());
- page1.setCurrent(current);
- page1.setSize(size);
- walletStatistics.setPage(page1);
+ Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
+ walletStatisticsDetailPage.setCurrent(current);
+ walletStatisticsDetailPage.setSize(walletStatisticsDetailList.size());
+ walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2);
+ walletStatistics.setPage(walletStatisticsDetailPage);
walletStatistics.setTotalRecharge(totalRecharge);
walletStatistics.setTotalWithdraw(totalWithdraw);
walletStatistics.setTotalShopWithdraw(totalShopWithdraw);
return walletStatistics;
- }
-
- private WalletStatisticsDetail createWalletStatisticsDetail(ShopBalanceStatement item) {
- WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
- walletStatisticsDetail.setShopName(item.getShopName());
- walletStatisticsDetail.setUserName(item.getShopManagerName());
- walletStatisticsDetail.setUserPhone(item.getPhone());
- walletStatisticsDetail.setChangeType(4);
- walletStatisticsDetail.setCreateTime(item.getCreateTime());
- walletStatisticsDetail.setChangeAmount(item.getVariableAmount());
- return walletStatisticsDetail;
}
}
--
Gitblit v1.7.1