diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java
index 6980e295..5c16f701 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java
@@ -2,6 +2,7 @@ package cn.ysk.cashier.mybatis.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.ysk.cashier.cons.TableConstant;
 import cn.ysk.cashier.enums.OrderStatusEnums;
 import cn.ysk.cashier.enums.OrderUseTypeEnum;
 import cn.ysk.cashier.enums.ShopInfoEatModelEnum;
@@ -52,13 +53,10 @@ public class MpCashierCartServiceImpl extends ServiceImpl<TbCashierCartMapper, T
             throw new BadRequestException("店铺信息不存在");
         }
 
-        boolean isMunchies = StrUtil.isNotBlank(shopInfo.getRegisterType()) &&
-                ShopInfoRegisterlEnum.MUNCHIES.getValue().equals(shopInfo.getRegisterType());
-
         return list(new LambdaQueryWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getShopId, shopId)
                 .eq(TbCashierCart::getMasterId, masterId)
-                .eq(TbCashierCart::getUseType, isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue())
+                .eq(TbCashierCart::getUseType, TableConstant.OrderInfo.UseType.NONE_TABLE.getValue())
                 .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()));
     }
 
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 c8d4d47a..e59129ac 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
@@ -677,6 +677,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     .eq(TbCashierCart::getId, cashierCart.getId())
                     .set(TbCashierCart::getStatus, "return"));
             orderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
+                    .eq(TbOrderDetail::getCartId, cashierCart.getId())
+                    .eq(TbOrderDetail::getId, orderDetail.getId())
                     .set(TbOrderDetail::getUpdateTime, DateUtil.date())
                     .set(TbOrderDetail::getStatus, "return"));