From 9f6f13b473a83539688d1304e7fb8f1b2f773b39 Mon Sep 17 00:00:00 2001
From: "bl\\GQS02" <QiuSi.Guo@bl.com>
Date: Thu, 6 Nov 2025 11:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E6=AE=B5=E8=80=97=E7=94=B5=E9=87=8F?=
 =?UTF-8?q?=E4=B8=BAnull,=20=E5=88=99=E8=AE=BE=E7=BD=AE=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OrderBasicInfoServiceImpl.java       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

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 530cd3138..6a6f38b5c 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
@@ -3555,7 +3555,26 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      */
     @Override
     public OrderDetail getOrderDetailByOrderCode(String orderCode) {
-        return orderBasicInfoMapper.getOrderDetailByOrderCode(orderCode);
+        OrderDetail orderDetail = orderBasicInfoMapper.getOrderDetailByOrderCode(orderCode);
+        if (orderDetail != null) {
+            // 如果尖时段耗电量为null, 则设置为0
+            if (orderDetail.getSharpUsedElectricity() == null) {
+                orderDetail.setSharpUsedElectricity(BigDecimal.ZERO);
+            }
+            // 如果峰时段耗电量为null, 则设置为0
+            if (orderDetail.getPeakUsedElectricity() == null) {
+                orderDetail.setPeakUsedElectricity(BigDecimal.ZERO);
+            }
+            // 如果谷时段耗电量为null, 则设置为0
+            if (orderDetail.getValleyUsedElectricity() == null) {
+                orderDetail.setValleyUsedElectricity(BigDecimal.ZERO);
+            }
+            // 如果平时段耗电量为null, 则设置为0
+            if (orderDetail.getFlatUsedElectricity() == null) {
+                orderDetail.setFlatUsedElectricity(BigDecimal.ZERO);
+            }
+        }
+        return orderDetail;
     }
 
     @Override