Cui Zhi Feng
2024-08-28 bbe562d33fcbabf728032f4cc0d58be6e88ba0f4
支付空指针
已修改1个文件
3 ■■■■ 文件已修改
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -218,7 +218,8 @@
    private void setPartnerIncome(OrderItem oi, OrderItemSettlement ois){
        //合伙人结算:合伙人加价-理赔-缺货扣款 = 结算金额
        BigDecimal totalAmount = oi.getMarkupPartner().multiply(new BigDecimal(oi.getNum()));
        BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
        BigDecimal totalAmount = markupPartner.multiply(new BigDecimal(oi.getNum()));
        BigDecimal settlementAmount = totalAmount.subtract(ois.getSalesFeePartner()).subtract(ois.getLackFeePartner());//结算金额
        if(settlementAmount.doubleValue() < 0){
            settlementAmount = new BigDecimal(0);