diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index 1cde8ed..bfab7a0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -754,6 +754,9 @@ public class CartService {
             }
 
             // 获取当前下单次数和用餐类型
+            if ("takeself".equals(sendType)) {
+                tableId = null;
+            }
             ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(tableId, shopId);
             Integer currentPlaceNum = getCurrentPlaceNum(tableId, shopId, shopEatTypeInfoDTO);
 
@@ -770,8 +773,9 @@ public class CartService {
                 queryWrapper.eq(TbCashierCart::getUserId, userId);
                 // 台桌点单
             } else {
+                String finalTableId = tableId;
                 queryWrapper.and(q -> {
-                    q.eq(TbCashierCart::getTableId, tableId).or().eq(TbCashierCart::getUserId, userId);
+                    q.eq(TbCashierCart::getTableId, finalTableId).or().eq(TbCashierCart::getUserId, userId);
                 });
 
                 shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()