fix:还原

cloudroam

2024-09-09 08df1a408d57de206c8dfda3182d24f8e735c579

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

@@ -125,12 +125,13 @@
                        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 markupOne = oi.getMarkupOne() == null ? new BigDecimal(0) : oi.getMarkupOne();
                        BigDecimal markupOne = getAmount(oi.getMarkupOne());
                        BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
                        lackFeePlatform = markupOne.multiply(new BigDecimal(lackNum));
                        lackFeePlatform = lackFeePlatform.add(oi.getMarkupTwo().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;
                        replaceFee = amount == null ? new BigDecimal(0) : amount;