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 7268225..9b56805 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -181,7 +181,15 @@ public class CartService {
                 }
             }
         } else {
-            List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectByShopIdAndTableId(shopId, tableId);
+            // 查询购物车所有信息
+            LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
+                    .eq(TbCashierCart::getShopId, shopId)
+                    .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -3).getTime())
+                    .eq(TbCashierCart::getUserId, userId)
+                    .isNull(TbCashierCart::getOrderId)
+                    .eq(TbCashierCart::getStatus, "create");
+
+            List<TbCashierCart> tbCashierCarts =  mpCashierCartMapper.selectList(queryWrapper);;
             if (!CollectionUtils.isEmpty(tbCashierCarts)) {
                 for (TbCashierCart cashierCart : tbCashierCarts) {
                     array.add(cashierCart);
@@ -772,7 +780,7 @@ public class CartService {
                     orderId = Integer.valueOf(cart.getOrderId());
                 }
 
-                cart.setStatus("final");
+                cart.setStatus(shopEatTypeInfoDTO.isDineInAfter() ? "create" : "final");
                 if (cart.getId() != null) {
                     mpCashierCartMapper.updateById(cart);
                 } else {