From 82e40dc82ad14a32c9ed841e5e7f7b788eb01009 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 26 Mar 2026 10:14:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=A1=8C=20=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/order/dto/MergeOrderDTO.java | 5 +++++ .../order/service/impl/OrderInfoCustomServiceImpl.java | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MergeOrderDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MergeOrderDTO.java index 87f2c3665..5d027ab10 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MergeOrderDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MergeOrderDTO.java @@ -29,4 +29,9 @@ public class MergeOrderDTO implements Serializable { * 转台详情Id */ private List detailIds; + + /** + * 是否全部商品转台 0:否 1:是 + */ + private Integer allMerge; } 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 18f09246f..7025f9e47 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 @@ -553,6 +553,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { if (param.getTargetOrderId() == null && StrUtil.isBlank(param.getTargetTableCode())) { throw new CzgException("转台失败，请选择目标台桌后转台"); } + if(param.getAllMerge()==null){ + param.setAllMerge(0); + } OrderInfo sourceOrder = orderInfoService.getById(param.getSourceOrderId()); if (sourceOrder == null || !sourceOrder.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) { throw new CzgException("转台失败，无可转订单"); @@ -595,7 +598,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { 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()); + if(param.getAllMerge()==1){ + shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceOrder.getTableCode(), ShopTableStatusEnum.IDLE.getValue()); + } shopTableService.updateStatus(sourceOrder.getShopId(), null, targetOrder.getTableCode(), ShopTableStatusEnum.UNSETTLED.getValue()); return CzgResult.success(); }