From a8b4f6308684bd0147c5af46f9e86830cfb878f7 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sun, 29 Sep 2024 10:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=BA=97=E9=93=BA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E9=A4=90=E4=BD=8D=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/ProductService.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 95bcc4b..05c4eb7 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -150,7 +150,7 @@ public class ProductService {
         if (tbShopTable != null) {
             tbShopTable.setOrderId(order == null ? null : order.getId());
             TbCashierCart seatCartInfo = getSeatCartInfo(tbShopTable.getShopId(), tbShopTable.getQrcode(), Integer.valueOf(userId), shopEatTypeInfoDTO);
-            tbShopTable.setChoseCount(seatCartInfo != null && (seatCartInfo.getNumber() != null));
+            tbShopTable.setChoseCount((shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee().equals(1))  || (seatCartInfo != null && (seatCartInfo.getNumber() != null)));
         }
 
         concurrentMap.put("shopTableInfo", tbShopTable == null ? "" : tbShopTable);