加价计算空指针

Cui Zhi Feng

2024-09-05 46a8faa3b27b30a04c40d3eb90d774429d8581f5

 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) {
@@ -125,6 +125,10 @@
            b = b.add(feePlatform).add(feePlatformPack).add(feePlatformCheck).add(feePlatformTransport);
            platformSalesMap.put(orderItemId, b);
        }
    }

    protected BigDecimal getAmount(BigDecimal amount){
        return amount == null ? new BigDecimal(0) : amount;
    }

    protected void prepareSalesAmount(OrderSalesItem s
@@ -221,7 +225,7 @@
                    break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
            dto.setFirstFee(b);
        }

@@ -280,7 +284,7 @@
                        break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
            dto.setSecondFee(b);

            FlowerMarkupSpCg fmpsc = null;
@@ -335,7 +339,7 @@
                        break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
            dto.setPartnerFee(b);
        }

@@ -373,7 +377,7 @@
                    break;
                }
            }
            fp = fp.add(b);
            fp = fp.add(getAmount(b));
        }

        //二次加价
@@ -431,7 +435,7 @@
                    break;
            }
        }
        fp = fp.add(b);
        fp = fp.add(getAmount(b));

        return fp;
    }