From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 29 -----------------------------
1 files changed, 0 insertions(+), 29 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..5b2d63d 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
@@ -82,24 +82,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());
@@ -145,17 +127,6 @@
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