diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 44baa54a..dbe19ecd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -320,14 +320,19 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 .eq(TbCashierCart::getShopId, addCartDTO.getShopId())
                 .eq(TbCashierCart::getSkuId, addCartDTO.getSkuId())
                 .eq(TbCashierCart::getProductId, addCartDTO.getProductId())
-                .eq(TbCashierCart::getTableId, addCartDTO.getTableId());
-        if (addCartDTO.getVipUserId() != null) {
-            query.eq(TbCashierCart::getUserId, addCartDTO.getVipUserId());
-        } else {
-            query.eq(TbCashierCart::getMasterId, addCartDTO.getMasterId());
-            query.isNull(TbCashierCart::getUserId);
-        }
-
+                .eq(TbCashierCart::getTableId, addCartDTO.getTableId())
+                .and(query2 -> {
+                    query2.and(query3 -> {
+                        query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
+                                .eq(TbCashierCart::getMasterId, addCartDTO.getMasterId());
+                            })
+                            .or()
+                            .and(query4 -> {
+                                query4.isNull(TbCashierCart::getTradeDay)
+                                        .eq(TbCashierCart::getMasterId, "");
+                            })
+                    ;
+                });
         TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query);
         // 首次加入
         if (tbCashierCart == null) {
@@ -435,9 +440,17 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 .eq(TbCashierCart::getTableId, tableId)
                 .in(TbCashierCart::getStatus, "create")
                 .eq(TbCashierCart::getShopId, shopId)
-                .and(query -> {
-                    query.eq(TbCashierCart::getMasterId, masterId).or()
-                            .isNull(TbCashierCart::getMasterId);
+                .and(query2 -> {
+                    query2.and(query3 -> {
+                                query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
+                                        .eq(TbCashierCart::getMasterId, masterId);
+                            })
+                            .or()
+                            .and(query4 -> {
+                                query4.isNull(TbCashierCart::getTradeDay)
+                                        .eq(TbCashierCart::getMasterId, "");
+                            })
+                    ;
                 });
 
 //        if (vipUserId != null) {
@@ -839,6 +852,13 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderInfo.setRemark(createOrderDTO.getNote());
             orderInfo.setUserId(String.valueOf(createOrderDTO.getVipUserId()));
             orderInfo.setCreatedAt(DateUtil.current());
+            TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
+                    .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
+                    .eq(TbMerchantAccount::getStatus, 1));
+            if (merchantAccount == null) {
+                throw new BadRequestException("商户信息不存在");
+            }
+            orderInfo.setMerchantId(merchantAccount.getId().toString());
             orderInfoMapper.insert(orderInfo);
         }