From 56eed8f3d4bc948e5cce6011caa096f927e949c0 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 27 Mar 2026 09:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 e9c22f343..9896736ff 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
@@ -549,6 +549,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
     }
 
     @Override
+    @Transactional
     public CzgResult<Object> mergeOrder(MergeOrderDTO param) {
         if (param.getTargetOrderId() == null && StrUtil.isBlank(param.getTargetTableCode())) {
             throw new CzgException("转台失败，请选择目标台桌后转台");
@@ -601,6 +602,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
         }
         if(param.getAllMerge()==1){
             shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceOrder.getTableCode(), ShopTableStatusEnum.IDLE.getValue());
+            orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getId, sourceOrder.getId()));
         }
         shopTableService.updateStatus(sourceOrder.getShopId(), null, targetOrder.getTableCode(), ShopTableStatusEnum.UNSETTLED.getValue());
         return CzgResult.success();