From 19dc96e814330dd957515b5eb4a57396af41b3b3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 15:10:19 +0800
Subject: [PATCH] 修改快递查询逻辑
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 69 ++++++----------------------------
1 files changed, 13 insertions(+), 56 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 2932024..147d78f 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
@@ -12,6 +12,7 @@
import com.ruoyi.account.vo.WalletStatisticsDetail;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.other.api.domain.ShopBalanceStatement;
import com.ruoyi.other.api.feignClient.ShopClient;
@@ -36,13 +37,13 @@
Page<BalanceChangeRecord> page = new Page<>();
page.setCurrent(agentQuery.getPageNum());
page.setSize(agentQuery.getPageSize());
- IPage<BalanceChangeRecord> shopIPage = this.baseMapper.pageList(page, agentQuery);
- return shopIPage;
+ return this.baseMapper.pageList(page, agentQuery);
}
@Override
public CommissionStatistics commissionStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) {
List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
+
BigDecimal totalCommission = balanceChangeRecordList.stream()
.filter(item -> !(item.getChangeType().equals(2) && item.getChangeType().equals(5)))
.map(BalanceChangeRecord::getChangeAmount)
@@ -50,53 +51,25 @@
.setScale(2, RoundingMode.HALF_UP);
IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
+ // 过滤商城购物
+ List<BalanceChangeRecord> collect = balanceChangeRecordIPage.getRecords().stream().filter(e -> e.getChangeType() != 5).collect(Collectors.toList());
+ balanceChangeRecordIPage.setRecords(collect);
return new CommissionStatistics(totalCommission, balanceChangeRecordIPage);
}
@Override
public WalletStatistics walletStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) {
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
- shopBalanceStatement.setType(4);
+ 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) {
+ IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
+ IPage<WalletStatisticsDetail> walletStatisticsDetailIPage = balanceChangeRecordIPage.convert(changeRecord -> {
WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
BeanUtils.copyBeanProp(walletStatisticsDetail, changeRecord);
- walletStatisticsDetailList.add(walletStatisticsDetail);
- }
+ return walletStatisticsDetail;
+ });
- walletStatisticsDetailList.addAll(r.getData().stream().map(this::createWalletStatisticsDetail).collect(Collectors.toList()));
-
- // 按时间排序（倒序）
- walletStatisticsDetailList.sort(Comparator.comparing(WalletStatisticsDetail::getCreateTime).reversed());
-
- long current = page.getCurrent();
- long size = page.getSize();
- int fromIndex = (int) (current - 1);
- int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());
-
- if (fromIndex < 0 || toIndex > walletStatisticsDetailList.size()) {
- throw new ServiceException("页面参数无效");
- }
-
- List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
-
-
- Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
+ Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailIPage.getRecords().stream()
.collect(Collectors.groupingBy(
WalletStatisticsDetail::getChangeType,
Collectors.reducing(
@@ -112,27 +85,11 @@
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);
+ walletStatistics.setPage(walletStatisticsDetailIPage);
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