From 7bd9f8e97b092086d4acb3b798fd60f0cc4d2556 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 27 Sep 2024 14:39:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E9=A4=90=E4=BA=BA=E6=95=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProductService.java               | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

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 9df4c59..014452a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -142,7 +142,9 @@ public class ProductService {
         TbOrderInfo order = getCurrentOrder(shopEatTypeInfoDTO, code, shopInfo.getId());
         if (tbShopTable != null) {
             tbShopTable.setOrderId(order == null ? null : order.getId());
-            tbShopTable.setChoseCount(order != null && (order.getSeatCount() != null));
+            TbCashierCart seatCartInfo = getSeatCartInfo(shopId, tbShopTable.getQrcode(), Integer.valueOf(userId), shopEatTypeInfoDTO);
+            tbShopTable.setChoseCount(seatCartInfo != null && (seatCartInfo.getNumber() != null));
+
         }
 
         concurrentMap.put("shopTableInfo", tbShopTable == null ? "" : tbShopTable);
@@ -894,16 +896,7 @@ public class ProductService {
 
         Integer userId = TokenUtil.getUserId();
 
-        LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
-                .eq(TbCashierCart::getShopId, choseCountDTO.getShopId())
-                .eq(TbCashierCart::getProductId, "-999")
-                .eq(TbCashierCart::getSkuId, "-999")
-                .eq(TbCashierCart::getStatus, "create")
-                .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
-                .and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId))
-                .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
-                .eq(TbCashierCart::getTableId, choseCountDTO.getTableId());
-        TbCashierCart tbCashierCart = mpCashierCartMapper.selectOne(query);
+        TbCashierCart tbCashierCart = getSeatCartInfo(choseCountDTO, userId, shopEatTypeInfoDTO);
 
         if (tbCashierCart == null) {
             tbCashierCart = new TbCashierCart();
@@ -939,6 +932,19 @@ public class ProductService {
         return tbCashierCart;
     }
 
+    private TbCashierCart getSeatCartInfo(Object shopId, String tableId, Integer userId, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
+        LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
+                .eq(TbCashierCart::getShopId, shopId)
+                .eq(TbCashierCart::getProductId, "-999")
+                .eq(TbCashierCart::getSkuId, "-999")
+                .eq(TbCashierCart::getStatus, "create")
+                .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
+                .and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId))
+                .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
+                .eq(TbCashierCart::getTableId, tableId);
+        return mpCashierCartMapper.selectOne(query);
+    }
+
     public Object choseEatModel(ChoseEatModelDTO choseTableDTO) {
         ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(choseTableDTO.getTableId(), choseTableDTO.getShopId());
         if (!shopEatTypeInfoDTO.isTakeout()) {