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 a6682883..4157c66e 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
@@ -3429,6 +3429,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         TbCashierCart currentSeatFee = null;
         ArrayList<TbCashierCart> updateCartInfos = new ArrayList<>();
         for (TbCashierCart item : cashierCarts) {
+            if (item.getOrderId() == null) {
+                throw new BadRequestException("商品未下单无法转台并台");
+            }
             if (targetSeatFee == null || !TableConstant.CART_SEAT_ID.equals(item.getProductId())) {
                 item.setTableId(switchTableDTO.getTargetTableId());
                 item.setMasterId(masterId);
@@ -3436,9 +3439,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             }
             cartIds.add(item.getId());
 
-            if (item.getOrderId() != null) {
-                orderId = item.getOrderId();
-            }
+            orderId = item.getOrderId();
 
             if (TableConstant.CART_SEAT_ID.equals(item.getProductId())) {
                 currentSeatFee = item;