转台

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