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 787b45ed..d53701c0 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
@@ -3370,7 +3370,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         if (switchTableDTO.isFull()) {
             cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, switchTableDTO.getMasterId(), switchTableDTO.getOrderId(),
                     true, TableConstant.OrderInfo.Status.CREATE, TableConstant.OrderInfo.Status.RETURN);
-        }else {
+        } else {
             if (switchTableDTO.getCartIds().isEmpty()) {
                 throw new BadRequestException("请选择转单商品");
             }
@@ -3400,6 +3400,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             }
         }
 
+        if (targetOrderId == null) {
+            throw new BadRequestException("目标桌未开台");
+        }
+
         // 修改原有购物车数据
         ArrayList<Integer> cartIds = new ArrayList<>();
         Integer orderId = switchTableDTO.getOrderId();
@@ -3441,7 +3445,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             mpOrderInfoService.removeById(orderId);
         }
 
-        if (!switchTableDTO.isFull() && switchTableDTO.getCartIds().size() != totalSize){
+        if (!switchTableDTO.isFull() && switchTableDTO.getCartIds().size() != totalSize) {
             // 重新创建订单数据
             CreateOrderDTO createOrderDTO = new CreateOrderDTO();
             createOrderDTO.setMasterId(switchTableDTO.getMasterId());
@@ -3451,15 +3455,13 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             createOrder(createOrderDTO, false);
         }
 
-        if (targetOrderId != null) {
-            // 重新创建订单数据
-            CreateOrderDTO createOrderDTO = new CreateOrderDTO();
-            createOrderDTO.setMasterId(masterId);
-            createOrderDTO.setShopId(switchTableDTO.getShopId());
-            createOrderDTO.setTableId(switchTableDTO.getTargetTableId());
-            createOrderDTO.setUseType(targetShopEatTypeInfoDTO.getUseType());
-            createOrder(createOrderDTO, false);
-        }
+        // 重新创建订单数据
+        CreateOrderDTO createOrderDTO = new CreateOrderDTO();
+        createOrderDTO.setMasterId(masterId);
+        createOrderDTO.setShopId(switchTableDTO.getShopId());
+        createOrderDTO.setTableId(switchTableDTO.getTargetTableId());
+        createOrderDTO.setUseType(targetShopEatTypeInfoDTO.getUseType());
+        createOrder(createOrderDTO, false);
 
         return true;