From 1534c537d5438b833919fc0877e24bcd446f62b6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 27 Mar 2026 10:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/OrderInfoCustomServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
index 86e76cdcd..8d5871223 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -561,6 +561,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
         if (sourceOrder == null || !sourceOrder.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) {
             throw new CzgException("转台失败，无可转订单");
         }
+        String sourceTableCode = sourceOrder.getTableCode();
         OrderInfo targetOrder = orderInfoService.getOne(QueryWrapper.create().eq(OrderInfo::getId, param.getTargetOrderId())
                 .eq(OrderInfo::getTableCode, param.getTargetTableCode())
                 .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()));
@@ -599,7 +600,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
             }
         }
         if(param.getAllMerge()==1){
-            shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceOrder.getTableCode(), ShopTableStatusEnum.IDLE.getValue());
+            shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceTableCode, ShopTableStatusEnum.IDLE.getValue());
         }
         shopTableService.updateStatus(sourceOrder.getShopId(), null, targetOrder.getTableCode(), ShopTableStatusEnum.UNSETTLED.getValue());
         return CzgResult.success();