From fa9ecbc5c9a3c4e5ee300751e4fec53c272299f7 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sun, 3 Aug 2025 21:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sczx/order/service/impl/OrderServiceImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
index 8a40c5f..f4698e2 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -260,6 +260,9 @@ public class OrderServiceImpl implements OrderService {
                 .notIn(OrderMainPO::getOrderStatus, Arrays.asList(OrderStatusEnum.AUTO_END.getCode(), OrderStatusEnum.MANUAL_END.getCode()))
                 .orderByDesc(OrderMainPO::getOrderId).last(" limit 1");
         OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper);
+        if(orderMainPO==null){
+            return null;
+        }
         return getOrderDetailByOrderNo(orderMainPO.getOrderNo());
     }