From f94d845814d209b7b5cda0ea70a2e8cb6cda5b39 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 15:22:50 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 8a94449..6a6d49b 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
@@ -41,10 +41,12 @@
)
));
- BigDecimal totalCommission = shopCommissionMap.get(1);
- BigDecimal totalSubordinateCommission = shopCommissionMap.get(2);
- BigDecimal totalServiceCharge = shopCommissionMap.get(3);
-
+ BigDecimal totalCommission = shopCommissionMap.getOrDefault(1,BigDecimal.ZERO);
+ BigDecimal totalSubordinateCommission = shopCommissionMap.getOrDefault(2,BigDecimal.ZERO);
+ BigDecimal totalServiceCharge = shopCommissionMap.getOrDefault(3,BigDecimal.ZERO);
+ shopCommissionStatisticsVO.setTotalCommission(totalCommission);
+ shopCommissionStatisticsVO.setTotalSubordinateCommission(totalSubordinateCommission);
+ shopCommissionStatisticsVO.setTotalServiceCharge(totalServiceCharge);
BigDecimal totalAmount = totalCommission.add(totalSubordinateCommission).add(totalServiceCharge);
shopCommissionStatisticsVO.setTotalAmount(totalAmount);
--
Gitblit v1.7.1