结算 null

Cui Zhi Feng

2024-09-08 ffe08c1c77c2c03273648977c6e44583aec80939

 src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java

@@ -125,11 +125,12 @@
                        lackNum = num == null ? 0 : num;
                        lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(lackNum));

                        BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
                        BigDecimal markupPartner = getAmount(oi.getMarkupPartner());
                        lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));

                        BigDecimal markupTwo = oi.getMarkupTwo() == null ? new BigDecimal(0) : oi.getMarkupTwo();
                        lackFeePlatform = oi.getMarkupOne().multiply(new BigDecimal(lackNum));
                        BigDecimal markupOne = getAmount(oi.getMarkupOne());
                        BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
                        lackFeePlatform = markupOne.multiply(new BigDecimal(lackNum));
                        lackFeePlatform = lackFeePlatform.add(markupTwo.multiply(new BigDecimal(lackNum)));
                    } else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
                        replaceNum = num == null ? 0 : num;