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 676c4a0..84a5d41 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1602,15 +1602,16 @@ public class CartService {
             });
 
         }else {
-            cashierCartList = new ArrayList<>();
-            String tableCartKey = RedisCst.getTableCartKey(choseEatModelDTO.getShopId().toString(), choseEatModelDTO.getTableId(), userId);
-            String message = redisUtil.getMessage(tableCartKey);
-            if (StrUtil.isNotBlank(message)) {
-                JSONObject.parseArray(message).forEach(item -> {
-                    TbCashierCart cart = JSONObject.parseObject(item.toString(), TbCashierCart.class);
-                    cashierCartList.add(cart);
-                });
-            }
+            // 查询购物车所有信息
+            ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(choseEatModelDTO.getTableId(), choseEatModelDTO.getShopId());
+            LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
+                    .eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
+                    .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
+                    .isNull(TbCashierCart::getOrderId)
+                    .eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId())
+                    .and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, ""))
+                    .eq(TbCashierCart::getStatus, "create");
+            cashierCartList = mpCashierCartMapper.selectList(queryWrapper);
         }
 
         // 所有订单信息