合并代码

puzhibing

2024-12-19 acb1b57cdf0f160b802f31c4f41b4daf4d2e9ce6

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopBalanceStatementServiceImpl.java

@@ -41,9 +41,9 @@
                        )
                ));

        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);

        BigDecimal totalAmount = totalCommission.add(totalSubordinateCommission).add(totalServiceCharge);
        shopCommissionStatisticsVO.setTotalAmount(totalAmount);