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 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();