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-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
index 9799f6b..31797f0 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java
@@ -51,14 +51,11 @@
shopCommissionStatisticsVO.setTotalAmount(totalAmount);
IPage<ShopBalanceStatement> statementIPage = this.baseMapper.queryShopBalanceStatementPage(page, shopBalanceStatement);
for (ShopBalanceStatement record : statementIPage.getRecords()) {
- BigDecimal subtract = record.getHistoricalBalance().subtract(record.getBalance());
- if (subtract.compareTo(BigDecimal.ZERO)>0){
+ if (record.getChangeDirection() == -1){
// 减少
record.setVariableAmountString("-￥"+record.getVariableAmount());
- }else if (subtract.compareTo(BigDecimal.ZERO)<0){
- record.setVariableAmountString("+￥"+record.getVariableAmount());
}else{
- record.setVariableAmountString("￥"+record.getVariableAmount());
+ record.setVariableAmountString("+￥"+record.getVariableAmount());
}
}
shopCommissionStatisticsVO.setStatementIPage(statementIPage);
--
Gitblit v1.7.1