From a04cc61a75c61025a4efcdd95b07d73b0f892ce9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 13:50:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 8f9ef27..0198cd8 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
@@ -53,6 +53,19 @@
IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
// 过滤商城购物
List<BalanceChangeRecord> collect = balanceChangeRecordIPage.getRecords().stream().filter(e -> e.getChangeType() != 5).collect(Collectors.toList());
+ for (BalanceChangeRecord changeRecord : collect) {
+ if (changeRecord.getBeforeAmount()!=null && changeRecord.getAfterAmount()!=null){
+ BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
+ if (subtract.compareTo(BigDecimal.ZERO)>0){
+ // 减少
+ changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
+ }else if (subtract.compareTo(BigDecimal.ZERO)<0){
+ changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
+ }else{
+ changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
+ }
+ }
+ }
balanceChangeRecordIPage.setRecords(collect);
return new CommissionStatistics(totalCommission, balanceChangeRecordIPage);
}
@@ -82,13 +95,15 @@
int fromIndex = (int) ((current - 1) * size);
int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());
+
+ Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
+ WalletStatistics walletStatistics = new WalletStatistics();
if (fromIndex >= walletStatisticsDetailList.size()) {
- throw new ServiceException("页面参数无效");
+ walletStatistics.setPage(walletStatisticsDetailPage);
+ return walletStatistics;
}
- List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
-
- Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList2.stream()
+ Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
.collect(Collectors.groupingBy(
WalletStatisticsDetail::getChangeType,
Collectors.reducing(
@@ -102,11 +117,11 @@
BigDecimal totalWithdraw = shopCommissionMap.get(2);
BigDecimal totalShopWithdraw = shopCommissionMap.get(7);
+ List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
- WalletStatistics walletStatistics = new WalletStatistics();
- Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
walletStatisticsDetailPage.setCurrent(current);
walletStatisticsDetailPage.setSize(size);
+ walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size());
walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2);
walletStatistics.setPage(walletStatisticsDetailPage);
walletStatistics.setTotalRecharge(totalRecharge);
--
Gitblit v1.7.1