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 e3ed197..e7e9c07 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -195,17 +195,21 @@ public class OrderService {
 
                 TbCashierCart finalCart = cart;
                 queryWrapper.eq(TbCashierCart::getTableId, cart.getTableId())
-                        .and(query -> {
-                            query.eq(TbCashierCart::getMasterId, finalCart.getMasterId())
-                                    .or()
-                                    .isNull(TbCashierCart::getMasterId)
-                                    .or()
-                                    .eq(TbCashierCart::getMasterId, "");
-                        })
-                        .and(query -> {
-                            query.eq(TbCashierCart::getOrderId, finalCart.getOrderId())
-                                    .or()
-                                    .isNull(TbCashierCart::getOrderId);
+                        .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"));