From 2a80dfece6be5eb184f1900eb55c999914b1627b Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 23 Sep 2024 16:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E8=BF=94=E5=9B=9E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=94=A8=E9=A4=90=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index f216dcaa..0c713782 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -163,7 +163,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 itemMap.put("tableId", date.getQrcode());
             }
 
-            itemMap.put("orderId", getCurrentOrderId(date.getQrcode(), date.getShopId().toString()));
+            String currentOrderId = getCurrentOrderId(date.getQrcode(), date.getShopId().toString());
+            TbOrderInfo orderInfo = orderInfoMapper.selectById(currentOrderId);
+            itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId());
+            itemMap.put("useType", orderInfo == null ? null : orderInfo.getUseType());
             infoList.add(itemMap);
         }
         int i = tbShopTableRepository.countAllByShopId(criteria.getShopId());