From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 6a6d49b..9799f6b 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
@@ -49,8 +49,18 @@
shopCommissionStatisticsVO.setTotalServiceCharge(totalServiceCharge);
BigDecimal totalAmount = totalCommission.add(totalSubordinateCommission).add(totalServiceCharge);
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){
+ // 减少
+ record.setVariableAmountString("-￥"+record.getVariableAmount());
+ }else if (subtract.compareTo(BigDecimal.ZERO)<0){
+ record.setVariableAmountString("+￥"+record.getVariableAmount());
+ }else{
+ record.setVariableAmountString("￥"+record.getVariableAmount());
+ }
+ }
shopCommissionStatisticsVO.setStatementIPage(statementIPage);
return shopCommissionStatisticsVO;
}
--
Gitblit v1.7.1