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 465b9a7..66a1c5d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -259,8 +259,8 @@ public class CartService {
             // 查询购物车所有信息
             LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
                     .eq(TbCashierCart::getShopId, shopEatTypeInfoDTO.getShopInfo().getId())
-                    .eq(TbCashierCart::getProductId, "-999")
-                    .eq(TbCashierCart::getSkuId, "-999")
+                    .eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)
+                    .eq(TbCashierCart::getSkuId, TableConstant.CART_SEAT_ID)
                     .eq(TbCashierCart::getStatus, "create")
                     .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                     .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 427938b..774490f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -397,11 +397,10 @@ public class PayService {
             return Result.fail("订单信息不存在");
         }
 
-        if (System.currentTimeMillis() - orderInfo.getCreatedAt() > 60 * 15 * 1000) {
+        if (!OrderUseTypeEnum.DINE_IN_AFTER.getValue().equals(orderInfo.getUseType()) && System.currentTimeMillis() - orderInfo.getCreatedAt() > 60 * 15 * 1000) {
             return Result.fail("订单十五分钟内有效,当前已超时,请重新下单。");
         }
 
-
         TbUserInfo userInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getUserId()));
         if (ObjectUtil.isEmpty(userInfo)) {
             return Result.fail("未获取到用户信息");
@@ -839,7 +838,8 @@ public class PayService {
                         }
                     }
                 } else {
-                    PublicResp<OrderStatusQueryResp> publicResp = thirdPayService.queryOrder(thirdUrl, thirdApply.getAppId(), payment.getTradeNumber(), null, thirdApply.getAppToken());
+                    PublicResp<OrderStatusQueryResp> publicResp = thirdPayService.queryOrder(thirdUrl, thirdApply.getAppId(),
+                            payment.getTradeNumber(), null, thirdApply.getAppToken());
                     if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) {
                         if ("000000".equals(publicResp.getCode())) {
                             String cartStatus = "";