Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-11 f18a802137a7642473891f6886d44cf0c229efed

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