转台

cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java

@@ -3,10 +3,7 @@ package com.czg.controller.admin;
 import com.czg.annotation.Debounce;
 import com.czg.annotation.SaStaffCheckPermission;
 import com.czg.config.RabbitPublisher;
-import com.czg.order.dto.OrderInfoAddDTO;
-import com.czg.order.dto.OrderInfoPrintDTO;
-import com.czg.order.dto.OrderInfoQueryDTO;
-import com.czg.order.dto.OrderInfoRefundDTO;
+import com.czg.order.dto.*;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderInfoService;
 import com.czg.order.vo.HistoryOrderPrintVo;
@@ -76,15 +73,13 @@ public class AdminOrderController {
         return CzgResult.success(orderInfoService.createOrder(addDto));
     }
 
-//    /**
-//     * 合单
-//     * @param refundDTO
-//     * @return
-//     */
-//    @PostMapping("/mergeOrder")
-//    public CzgResult<Object> mergeOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) {
-//
-//    }
+    /**
+     * 转桌
+     */
+    @PostMapping("/mergeOrder")
+    public CzgResult<Object> mergeOrder(@Validated @RequestBody MergeOrderDTO param) {
+        return orderInfoService.mergeOrder(param);
+    }
 
     /**
      * 订单全额退款 只传订单id

cash-common/cash-common-service/src/main/java/com/czg/order/dto/MergeOrderDTO.java

@@ -0,0 +1,32 @@
+package com.czg.order.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ww
+ * @description
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MergeOrderDTO implements Serializable {
+    @NotNull(message = "订单Id不能为空")
+    private Long sourceOrderId;
+    /**
+     * 目标订单Id
+     */
+    private Long targetOrderId;
+    /**
+     * 目标台桌
+     */
+    private String targetTableCode;
+    /**
+     * 转台详情Id
+     */
+    private List<Long> detailIds;
+}

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java

@@ -19,7 +19,6 @@ import java.util.List;
  * @since 2025-02-13
  */
 @Data
-
 @NoArgsConstructor
 @AllArgsConstructor
 public class OrderInfoRefundDTO implements Serializable {

cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java

@@ -39,6 +39,8 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     OrderInfo checkOrderPay(CheckOrderPay param);
 
+    CzgResult<Object> mergeOrder(MergeOrderDTO param);
+
     void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson);
 
     void refundCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson);

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java

@@ -360,6 +360,54 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return orderInfo;
     }
 
+    @Override
+    public CzgResult<Object> mergeOrder(MergeOrderDTO param) {
+        if (param.getTargetOrderId() == null && StrUtil.isBlank(param.getTargetTableCode())) {
+            throw new ValidateException("转台失败，请选择目标台桌后转台");
+        }
+        OrderInfo sourceOrder = getById(param.getSourceOrderId());
+        if (sourceOrder == null || !sourceOrder.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) {
+            throw new ValidateException("转台失败，无可转订单");
+        }
+        OrderInfo targetOrder = queryChain()
+                .eq(OrderInfo::getId, param.getTargetOrderId())
+                .eq(OrderInfo::getTableCode, param.getTargetTableCode())
+                .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())
+                .one();
+        if (targetOrder == null) {
+            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, null);
+        }
+        if (CollUtil.isEmpty(param.getDetailIds())) {
+            long count = orderDetailService.queryChain().eq(OrderDetail::getOrderId, sourceOrder.getId()).count();
+            if (count < 1) {
+                throw new ValidateException("转台失败，该订单无可转商品");
+            }
+            orderDetailService.updateChain()
+                    .eq(OrderDetail::getOrderId, sourceOrder.getId())
+                    .set(OrderDetail::getOrderId, targetOrder.getId())
+                    .update();
+        } else {
+            orderDetailService.updateChain()
+                    .eq(OrderDetail::getOrderId, sourceOrder.getId())
+                    .in(OrderDetail::getId, param.getDetailIds())
+                    .set(OrderDetail::getOrderId, targetOrder.getId())
+                    .update();
+        }
+        return CzgResult.success();
+    }
+
     /**
      * 填充 单价/付款金额
      *