优化

gongzuming

2024-11-12 24f7f046f8854d63839ad52d0cff34ea45a0f449

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

@@ -130,7 +130,7 @@

                        BigDecimal markupOne = getAmount(oi.getMarkupOne());
                        BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
                        BigDecimal ppPrice = markupOne.add(markupTwo).subtract(oi.getCouponAmount());//1次加价+2次加价-优惠券金额
                        BigDecimal ppPrice = markupOne.add(markupTwo).subtract(getAmount(oi.getCouponAmount()));//1次加价+2次加价-优惠券金额
                        lackFeePlatform = lackFeePlatform.add(ppPrice.multiply(new BigDecimal(lackNum)));
                    } else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
                        replaceNum = num == null ? 0 : num;
@@ -173,8 +173,10 @@
                    BigDecimal feePlatformPack = s.getFeePlatformPack();
                    BigDecimal feePlatformCheck = s.getFeePlatformCheck();
                    BigDecimal feePlatformTransport = s.getFeePlatformTransport();
                    BigDecimal feePackingTransport = s.getFeePackingTransport();
                    salesFeePlatform = salesFeePlatform.add(feePlatform)
                            .add(feePlatformPack).add(feePlatformCheck).add(feePlatformTransport);
                            .add(feePlatformPack).add(feePlatformCheck)
                            .add(feePlatformTransport).add(feePackingTransport);
                    salesFeeSupplier = salesFeeSupplier.add(feeSupplier);
                    salesFeePartner = salesFeePartner.add(feePartner);
                }