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 608cb9b7..b6666671 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
@@ -2187,16 +2187,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             }
         }
 
-        TbOrderInfo orderInfo = mpOrderInfoService.getById(orderId);
-        if(!TableConstant.OrderInfo.Status.UNPAID.equalsVals(orderInfo.getStatus())) {
-            throw new BadRequestException("订单状态异常");
+        CreateOrderDTO dto = null;
+        if (orderId != null) {
+            TbOrderInfo orderInfo = mpOrderInfoService.getById(orderId);
+            if(!TableConstant.OrderInfo.Status.UNPAID.equalsVals(orderInfo.getStatus())) {
+                throw new BadRequestException("订单状态异常");
+            }
+            dto = new CreateOrderDTO();
+            dto.setTableId(orderInfo.getTableId());
+            dto.setOrderId(orderInfo.getId());
+            dto.setShopId(Integer.valueOf(orderInfo.getShopId()));
+            dto.setMasterId(orderInfo.getMasterId());
+            dto.setUseType(orderInfo.getUseType());
         }
-        CreateOrderDTO dto = new CreateOrderDTO();
-        dto.setTableId(orderInfo.getTableId());
-        dto.setOrderId(orderInfo.getId());
-        dto.setShopId(Integer.valueOf(orderInfo.getShopId()));
-        dto.setMasterId(orderInfo.getMasterId());
-        dto.setUseType(orderInfo.getUseType());
+
 
         if (updateVipDTO.getType() == 0) {
             TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
@@ -2217,7 +2221,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     .set(TbOrderInfo::getMemberId, null));
         }
 
-        return createOrder(dto, true);
+        if (dto != null) {
+            return createOrder(dto, true);
+        }
+        return "";
 
     }