Cui Zhi Feng
2024-08-30 89307d4d3a9c2a278d4aaf9ee472a0f33ae8a05d
src/main/java/com/mzl/flower/service/BaseService.java
@@ -113,10 +113,10 @@
        }
        if (platformSalesMap != null) {
            BigDecimal feePlatform = s.getFeePlatform();
            BigDecimal feePlatformPack = s.getFeePlatformPack();
            BigDecimal feePlatformCheck = s.getFeePlatformCheck();
            BigDecimal feePlatformTransport = s.getFeePlatformTransport();
            BigDecimal feePlatform = getAmount(s.getFeePlatform());
            BigDecimal feePlatformPack = getAmount(s.getFeePlatformPack());
            BigDecimal feePlatformCheck = getAmount(s.getFeePlatformCheck());
            BigDecimal feePlatformTransport = getAmount(s.getFeePlatformTransport());
            BigDecimal b = platformSalesMap.get(orderItemId);
            if (b == null) {
@@ -127,6 +127,10 @@
        }
    }
    protected BigDecimal getAmount(BigDecimal amount){
        return amount == null ? new BigDecimal(0) : amount;
    }
    protected void prepareSalesAmount(OrderSalesItem s
            , Map<String, BigDecimal> supplierSalesMap
            , Map<String, BigDecimal> partnerSalesMap