From e8731e1d4d26f5e3c8ec3437a75329ba7ed4424f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 26 Mar 2026 09:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=A1=8C=20=E5=8F=B0=E6=A1=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/account/service/ShopTableService.java |  5 +++++
 .../service/impl/ShopTableServiceImpl.java    |  7 +++++++
 .../impl/OrderInfoCustomServiceImpl.java      | 21 ++++++++-----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java
index cf00d44bc..dd7b7fa9f 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopTableService.java
@@ -33,6 +33,11 @@ public interface ShopTableService extends IService<ShopTable> {
 
     Boolean updateInfo(long shopId, ShopTableDTO shopTableDTO);
 
+    /**
+     * 更新台桌状态
+     */
+    Boolean updateStatus(long shopId, Long tableId, String tableCode, String status);
+
     Boolean clear(long shopId, ShopTableClearDTO shopTableClearDTO);
     Boolean expiredTable(long tableId);
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java
index 1f49e176e..09b9bd801 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java
@@ -278,6 +278,13 @@ public class ShopTableServiceImpl extends ServiceImpl<ShopTableMapper, ShopTable
         return update(shopTable, new QueryWrapper().eq(ShopTable::getShopId, StpKit.USER.getShopId()).eq(ShopTable::getId, shopTableDTO.getId()));
     }
 
+    @Override
+    public Boolean updateStatus(long shopId, Long tableId, String tableCode, String status) {
+        ShopTable shopTable = new ShopTable();
+        shopTable.setStatus(status);
+        return update(shopTable, query().eq(ShopTable::getShopId, shopId).eq(ShopTable::getId, tableId).eq(ShopTable::getTableCode, tableCode));
+    }
+
     @Override
     public Boolean clear(long shopId, ShopTableClearDTO shopTableClearDTO) {
         ShopTable shopTable = getOne(new QueryWrapper().eq(ShopTable::getShopId, shopId).eq(ShopTable::getId, shopTableClearDTO.getId()));
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 0e00f2d2a..18f09246f 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
@@ -582,24 +582,21 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
             updateTargetOrder.setPlaceNum(targetOrder.getPlaceNum() + 1);
             orderInfoService.updateById(updateTargetOrder);
         }
+        OrderDetail orderDetailUp = new OrderDetail();
+        orderDetailUp.setOrderId(targetOrder.getId());
+        orderDetailUp.setPlaceNum(targetOrder.getPlaceNum());
         if (CollUtil.isEmpty(param.getDetailIds())) {
-            long count = orderDetailService.queryChain().eq(OrderDetail::getOrderId, sourceOrder.getId()).count();
+            long count = orderDetailService.count(new QueryWrapper().eq(OrderDetail::getOrderId, sourceOrder.getId()));
             if (count < 1) {
                 throw new CzgException("转台失败，该订单无可转商品");
             }
-            orderDetailService.updateChain()
-                    .eq(OrderDetail::getOrderId, sourceOrder.getId())
-                    .set(OrderDetail::getPlaceNum, targetOrder.getPlaceNum())
-                    .set(OrderDetail::getOrderId, targetOrder.getId())
-                    .update();
+            orderDetailService.update(orderDetailUp,new QueryWrapper().eq(OrderDetail::getOrderId, sourceOrder.getId()));
         } else {
-            orderDetailService.updateChain()
-                    .eq(OrderDetail::getOrderId, sourceOrder.getId())
-                    .in(OrderDetail::getId, param.getDetailIds())
-                    .set(OrderDetail::getPlaceNum, targetOrder.getPlaceNum())
-                    .set(OrderDetail::getOrderId, targetOrder.getId())
-                    .update();
+            orderDetailService.update(orderDetailUp,
+                    new QueryWrapper().eq(OrderDetail::getOrderId, sourceOrder.getId()).in(OrderDetail::getId, param.getDetailIds()));
         }
+        shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceOrder.getTableCode(), ShopTableStatusEnum.IDLE.getValue());
+        shopTableService.updateStatus(sourceOrder.getShopId(), null, targetOrder.getTableCode(), ShopTableStatusEnum.UNSETTLED.getValue());
         return CzgResult.success();
     }