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());