diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
index e0f749dd..d36df365 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
@@ -147,7 +147,7 @@ public class TbPlaceController {
     @PostMapping("/order")
     @ApiOperation("代客下单 查询购物车 /shop/table")
     public ResponseEntity<Object> createOrder(@RequestBody CreateOrderDTO createOrderDTO) {
-        return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, !createOrderDTO.isPostPay(), true));
+        return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, false));
     }
 
     @PostMapping("/pending")
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 4ec2167d..608cb9b7 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
@@ -1115,7 +1115,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     @Override
     @Transactional
-    public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId, boolean isPrint) {
+    public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean byOrderId) {
         createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId());
         return Utils.runFunAndCheckKey(() -> {
             TbShopInfo shopInfo = shopInfoRepository.findById(createOrderDTO.getShopId()).orElse(null);
@@ -1130,7 +1130,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             // 就餐模式信息
             ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getTableId(), createOrderDTO.getUseType());
 
-            OrderCartInfoDTO cartInfoDTO = getCartForCreateOrder(shopEatTypeInfoDTO, createOrderDTO.getMasterId(), shopUser);
+            OrderCartInfoDTO cartInfoDTO = getCartForCreateOrder(shopEatTypeInfoDTO, createOrderDTO.getMasterId(), shopUser, byOrderId ? createOrderDTO.getOrderId() : null);
             if (cartInfoDTO.getOrderId() == null) {
                 createOrderDTO.setOrderId(shopEatTypeInfoDTO.isDineInAfter() ?
                         getCurrentOrderId(shopEatTypeInfoDTO) : null);
@@ -1309,10 +1309,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         return infoDTO;
     }
 
-    private OrderCartInfoDTO getCartForCreateOrder(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId, TbShopUser shopUser) {
+    private OrderCartInfoDTO getCartForCreateOrder(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId, TbShopUser shopUser, Integer orderId) {
         OrderCartInfoDTO cartInfoDTO = new OrderCartInfoDTO();
-
-        List<TbCashierCart> allCashierCarts = mpCashierCartService.selectByShopEatType(shopEatTypeInfoDTO, masterId);
+        List<TbCashierCart> allCashierCarts;
+        if (orderId != null) {
+            allCashierCarts = mpCashierCartService.selectByOrderIdAndState(orderId, null);
+        }else {
+            allCashierCarts = mpCashierCartService.selectByShopEatType(shopEatTypeInfoDTO, masterId);
+        }
         TbCashierCart seatCart = null;
         for (TbCashierCart cashierCart : allCashierCarts) {
             if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
@@ -1751,7 +1755,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             createOrderDTO.setMasterId(pendingDTO.getMasterId());
             createOrderDTO.setNote(pendingDTO.getNote());
             createOrderDTO.setUseType(pendingDTO.getUseType());
-            orderId = createOrder(createOrderDTO, true, false).getId();
+            orderId = createOrder(createOrderDTO, false).getId();
 
         }
 
@@ -2195,8 +2199,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         dto.setUseType(orderInfo.getUseType());
 
         if (updateVipDTO.getType() == 0) {
-
-
             TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
             if (shopUser == null) {
                 throw new BadRequestException("用户信息不存在");
@@ -2215,7 +2217,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     .set(TbOrderInfo::getMemberId, null));
         }
 
-        return createOrder(dto, true, true);
+        return createOrder(dto, true);
 
     }
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
index 58fd4474..10be0f97 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
@@ -110,7 +110,7 @@ public interface TbShopTableService {
 
     void pack(PackCartDTO packCartDTO);
 
-    Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint);
+    Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId);
 
     JSONObject getMasterId(Integer shopId, String tableId, String useType, Integer orderId);