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

---
 .../impl/OrderInfoCustomServiceImpl.java      | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

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 8d5871223..64f2eac7d 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
@@ -569,11 +569,32 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
             ShopTable shopTable = shopTableService.getOneByTableCode(sourceOrder.getShopId(), param.getTargetTableCode());
             sourceOrder.setTableCode(shopTable.getTableCode());
             sourceOrder.setTableName(shopTable.getName());
-            OrderInfo upOrder = new OrderInfo();
-            upOrder.setTableCode(shopTable.getTableCode());
-            upOrder.setTableName(shopTable.getName());
-            orderInfoService.update(upOrder, new QueryWrapper().eq(OrderInfo::getId, sourceOrder.getId()));
-            targetOrder=sourceOrder;
+            if(param.getAllMerge()==1){
+                OrderInfo upOrder = new OrderInfo();
+                upOrder.setTableCode(shopTable.getTableCode());
+                upOrder.setTableName(shopTable.getName());
+                orderInfoService.update(upOrder, new QueryWrapper().eq(OrderInfo::getId, sourceOrder.getId()));
+                targetOrder=sourceOrder;
+            }else {
+                OrderInfoAddDTO addDTO = new OrderInfoAddDTO();
+                addDTO.setShopId(sourceOrder.getShopId());
+                addDTO.setStaffId(sourceOrder.getStaffId());
+                addDTO.setTableCode(param.getTargetTableCode());
+                addDTO.setOrderType(sourceOrder.getOrderType());
+                addDTO.setPlatformType(sourceOrder.getPlatformType());
+                addDTO.setPayMode(sourceOrder.getPayMode());
+                addDTO.setDineMode("dine-in");
+                addDTO.setPlaceNum(1);
+                addDTO.setWaitCall(false);
+                addDTO.setVipPrice(false);
+                ShopInfo shopInfo = shopInfoService.getById(sourceOrder.getShopId());
+                targetOrder = initOrderInfo(addDTO, shopInfo, shopTable);
+                OrderDetail orderDetailUp = new OrderDetail();
+                orderDetailUp.setOrderId(targetOrder.getId());
+                orderDetailUp.setPlaceNum(1);
+                orderDetailService.update(orderDetailUp,
+                        new QueryWrapper().eq(OrderDetail::getOrderId, sourceOrder.getId()).in(OrderDetail::getId, param.getDetailIds()));
+            }
         } else {
             targetOrder.setPlaceNum(targetOrder.getPlaceNum() + 1);
             //下单次数+1