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 bfab7a0..3cdbe33 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -763,7 +763,6 @@ public class CartService {
             // 查询购物车所有信息
             LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
                     .eq(TbCashierCart::getShopId, shopId)
-                    .and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType))
                     .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                     .eq(TbCashierCart::getStatus, "create");
 
@@ -776,7 +775,7 @@ public class CartService {
                 String finalTableId = tableId;
                 queryWrapper.and(q -> {
                     q.eq(TbCashierCart::getTableId, finalTableId).or().eq(TbCashierCart::getUserId, userId);
-                });
+                }).and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType));
 
                 shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper<TbShopTable>()
                         .eq(TbShopTable::getQrcode, tableId));