diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index e7e9c07..fbdf078 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -285,7 +285,31 @@ public class OrderService {
                 cashierCartMapper.updateByPrimaryKeySelective(cart);
             }
         } else {
-            List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
+            LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
+                    .notIn(TbCashierCart::getStatus, "final", "refund", "closed", "pending")
+                    .eq(TbCashierCart::getShopId, cart.getShopId());
+
+            TbCashierCart finalCart = cart;
+            queryWrapper.eq(TbCashierCart::getTableId, cart.getTableId())
+                    .and(q -> {
+                        q.or(
+                                        query -> {
+                                            query.eq(TbCashierCart::getMasterId, finalCart.getMasterId())
+                                                    .or()
+                                                    .isNull(TbCashierCart::getMasterId)
+                                                    .or()
+                                                    .eq(TbCashierCart::getMasterId, "");
+                                        }
+                                )
+                                .or(query -> {
+                                    query.eq(TbCashierCart::getOrderId, finalCart.getOrderId())
+                                            .or()
+                                            .isNull(TbCashierCart::getOrderId);
+                                });
+                    });
+
+            List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper.eq(TbCashierCart::getStatus, "create"));
+//            List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
 //            TbCashierCart cashierCart = cashierCartMapper.selectByDetail(masterId, productId, shopId, skuId.toString(), DateUtils.getDay(), uuid, tableId);
 
             String finalMasterId = masterId;