diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 11d3827..65ae0e0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -2497,6 +2497,9 @@ public class OrderService {
             createOrderDTO.setMasterId(switchTableDTO.getMasterId());
             createOrderDTO.setShopId(switchTableDTO.getShopId());
             createOrderDTO.setTableId(switchTableDTO.getCurrentTableId());
+            JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
+            String userId = jsonObject.getString("accountId");
+            createOrderDTO.setMerchantId(Integer.valueOf(userId));
             createOrder(createOrderDTO, "pc", token, switchTableDTO.getOrderId());
         }
 
@@ -2506,6 +2509,9 @@ public class OrderService {
             createOrderDTO.setMasterId(masterId);
             createOrderDTO.setShopId(switchTableDTO.getShopId());
             createOrderDTO.setTableId(switchTableDTO.getTargetTableId());
+            JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
+            String userId = jsonObject.getString("accountId");
+            createOrderDTO.setMerchantId(Integer.valueOf(userId));
             createOrder(createOrderDTO, "pc", token, targetOrderId);
         }