From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 d0a3cd0..930fd41 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
@@ -42,6 +42,7 @@
@Override
public CommissionStatistics commissionStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) {
+ balanceChangeRecord.setChangeType(4);
List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
BigDecimal totalCommission = balanceChangeRecordList.stream()
@@ -53,6 +54,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);
}
@@ -62,18 +76,15 @@
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
shopBalanceStatement.setType(1);
- List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
+ List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList1(balanceChangeRecord);
List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>();
for (BalanceChangeRecord changeRecord : balanceChangeRecordList) {
WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
BeanUtils.copyBeanProp(walletStatisticsDetail, changeRecord);
walletStatisticsDetailList.add(walletStatisticsDetail);
}
-
-
// 按时间排序（倒序）
walletStatisticsDetailList.sort(Comparator.comparing(WalletStatisticsDetail::getCreateTime).reversed());
-
long current = page.getCurrent();
long size = page.getSize();
if (current < 1) {
@@ -82,8 +93,12 @@
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;
}
@@ -102,18 +117,21 @@
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);
- walletStatistics.setTotalWithdraw(totalWithdraw);
- walletStatistics.setTotalShopWithdraw(totalShopWithdraw);
+ for (WalletStatisticsDetail changeRecord : walletStatisticsDetailList2) {
+ if (changeRecord.getChangeType().equals(1) || changeRecord.getChangeType().equals(3) || changeRecord.getChangeType().equals(4) || changeRecord.getChangeType().equals(6)) {
+ changeRecord.setChangeAmountString("+￥" + changeRecord.getChangeAmount());
+ } else {
+ changeRecord.setChangeAmountString("-￥" + changeRecord.getChangeAmount());
+ }
+ walletStatisticsDetailPage.setCurrent(current);
+ walletStatisticsDetailPage.setSize(size);
+ walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size());
+ walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2);
+ walletStatistics.setPage(walletStatisticsDetailPage);
+ walletStatistics.setTotalRecharge(totalRecharge);
+ walletStatistics.setTotalWithdraw(totalWithdraw);
+ walletStatistics.setTotalShopWithdraw(totalShopWithdraw);
+ }
return walletStatistics;
}
-
}
--
Gitblit v1.7.1