cloudroam
2024-09-30 b14befec1ef345d88a04da3ca1e10a006a7862e5
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -128,8 +128,9 @@
                        BigDecimal markupPartner = getAmount(oi.getMarkupPartner());
                        lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));
                        BigDecimal markupOne = getAmount(oi.getMarkupOne());
                        BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
                        BigDecimal ppPrice = oi.getMarkupOne().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;
@@ -172,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);
                }
@@ -222,7 +225,7 @@
    private void setPartnerIncome(OrderItem oi, OrderItemSettlement ois){
        //合伙人结算:合伙人加价-理赔-缺货扣款 = 结算金额
        BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
        BigDecimal markupPartner = getAmount(oi.getMarkupPartner());
        BigDecimal totalAmount = markupPartner.multiply(new BigDecimal(oi.getNum()));
        BigDecimal settlementAmount = totalAmount.subtract(ois.getSalesFeePartner()).subtract(ois.getLackFeePartner());//结算金额
        if(settlementAmount.doubleValue() < 0){