fix:合伙人列表操作日志

cloudroam

2024-12-04 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc

 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);
                }
@@ -258,4 +260,8 @@

        return fee;
    }

    public OrderItemSettlement selectOrderItemSettlementById(String id) {
        return orderItemSettlementMapper.selectOrderItemSettlementById(id);
    }
}