Cui Zhi Feng
2024-08-28 ebead665605fed9965b2673ec3e10d5873b21a2b
结算 bug 2
已修改1个文件
6 ■■■■ 文件已修改
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -128,9 +128,9 @@
                        BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
                        lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));
                        BigDecimal markupOne = oi.getMarkupOne() == null ? new BigDecimal(0) : oi.getMarkupOne();
                        lackFeePlatform = markupOne.multiply(new BigDecimal(lackNum));
                        lackFeePlatform = lackFeePlatform.add(oi.getMarkupTwo().multiply(new BigDecimal(lackNum)));
                        BigDecimal markupTwo = oi.getMarkupTwo() == null ? new BigDecimal(0) : oi.getMarkupTwo();
                        lackFeePlatform = oi.getMarkupOne().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;