From 686ab4ec7bd2a4c6b2f0b0911106acfd31de1286 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 11 Apr 2025 14:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E9=87=91=E9=A2=9D=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E9=BB=98=E8=AE=A40?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/OrderBasicInfoServiceImpl.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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);