From c17da7d4b3d31516b457e1d7201d7d41ef5b31e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 12 Dec 2024 14:37:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java         | 6 ++++++
 1 file changed, 6 insertions(+)

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);
         }