From 41e505e2f4d5ab27655ff937c6d3c9126a270b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 19 Nov 2024 10:08:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=B4=E6=97=B6=E8=8F=9C=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index 21df7134..52f21943 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -202,7 +202,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
             TbOrderDetail seatInfo = null;
             ArrayList<TbFullOrderDetail> detailList = new ArrayList<>();
             for (TbFullOrderDetail detail : details) {
-                if (TableConstant.CART_SEAT_ID.equals(detail.getProductId().toString())) {
+                if (detail.getProductId() != null && TableConstant.CART_SEAT_ID.equals(detail.getProductId().toString())) {
                     seatInfo = detail;
                 } else {
                     detailList.add(detail);