diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 5392039ee..f5f87117b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2067,9 +2067,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } // 需要分成的电费金额 = 总电费金额 - 电费优惠金额 - BigDecimal orderElectricityAmount = afterSettleOrderDTO.getOrderElectricityAmount().subtract(afterSettleOrderDTO.getOrderElectricityDiscountAmount()); + BigDecimal orderElectricityAmount = afterSettleOrderDTO.getOrderElectricityAmount() + .subtract(afterSettleOrderDTO.getOrderElectricityDiscountAmount() != null ? afterSettleOrderDTO.getOrderElectricityDiscountAmount() : BigDecimal.ZERO); // 需要分成的服务费金额 = 总服务费金额 - 服务费优惠金额 - BigDecimal orderServiceAmount = afterSettleOrderDTO.getOrderServiceAmount().subtract(afterSettleOrderDTO.getOrderServiceDiscountAmount()); + BigDecimal orderServiceAmount = afterSettleOrderDTO.getOrderServiceAmount() + .subtract(afterSettleOrderDTO.getOrderServiceDiscountAmount() != null ? afterSettleOrderDTO.getOrderServiceDiscountAmount() : BigDecimal.ZERO); // 校验 结算金额 = 需要分成的电费金额 + 需要分成的服务费金额 if (orderElectricityAmount.add(orderServiceAmount).compareTo(afterSettleOrderDTO.getOrderSettleAmount()) != 0) { logger.info("订单结算金额:{}与需要分成的电费金额:{}+需要分成的服务费金额:{}不相等", afterSettleOrderDTO.getOrderSettleAmount(), orderElectricityAmount, orderServiceAmount);