From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 637469f..94bfac2 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
@@ -66,16 +66,11 @@
// 过滤商城购物
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());
- }
+ if (changeRecord.getChangeDirection() == -1){
+ // 减少
+ changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
+ }else {
+ changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
}
}
balanceChangeRecordIPage.setRecords(collect);
@@ -95,14 +90,12 @@
WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
BeanUtils.copyBeanProp(walletStatisticsDetail, changeRecord);
- BigDecimal beforeAmount = changeRecord.getBeforeAmount();
- BigDecimal afterAmount = changeRecord.getAfterAmount();
if(changeRecord.getChangeType() == 2){
BigDecimal changeAmount = changeRecord.getChangeAmount();
totalWithdraw = totalWithdraw.add(changeAmount);
}
- if (beforeAmount.compareTo(afterAmount) > 0){
+ if (changeRecord.getChangeDirection() == -1){
walletStatisticsDetail.setFlag(2);
}else {
walletStatisticsDetail.setFlag(1);
@@ -181,9 +174,7 @@
}
});
- BigDecimal beforeAmount = bc.getBeforeAmount();
- BigDecimal afterAmount = bc.getAfterAmount();
- if (beforeAmount.compareTo(afterAmount) > 0){
+ if (bc.getChangeDirection() == -1){
bc.setFlag(2);
}else {
bc.setFlag(1);
--
Gitblit v1.7.1