From 8fa431f976e4ef1b1c7c30d88581dc9176439fcc Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 27 Feb 2025 11:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 1df503dcd..a9dce7032 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -146,6 +146,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         } else {
             historyOrderVo = getOneAs(new QueryWrapper().eq(OrderInfo::getId, orderId), HistoryOrderVo.class);
         }
+        if (historyOrderVo == null || historyOrderVo.getId() == null) {
+            return null;
+        }
         List<OrderDetail> orderDetails = orderDetailService.queryChain().select()
                 .eq(OrderDetail::getOrderId, historyOrderVo.getId()).list();
         Map<Integer, List<OrderDetail>> resultMap = new HashMap<>();