feat 支付对账收尾, 支付退款调整为订单+明细

daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayReconcileTradeEnum.java

@@ -0,0 +1,21 @@
+package cn.bootx.platform.daxpay.code;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 支付对账交易类型
+ * @author xxm
+ * @since 2024/1/23
+ */
+@Getter
+@AllArgsConstructor
+public enum PayReconcileTradeEnum {
+
+    PAY("pay","支付"),
+    REFUND("refund","退款"),
+    REVOKED("revoked","撤销");
+
+    private final String code;
+    private final String name;
+}

daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/order/RefundChannelOrderResult.java

@@ -11,19 +11,24 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@Schema(title = "支付退款通道明细数据")
-public class RefundOrderChannelResult {
+@Schema(title = "通道退款订单")
+public class RefundChannelOrderResult {
 
     @Schema(description = "通道")
     private String channel;
 
-    /** 关联支付网关退款请求号 */
-    @Schema(description = "异步方式关联退款请求号(部分退款情况)")
-    private String refundRequestNo;
+    @Schema(description = "通道支付单id")
+    private Long payChannelId;
+
+    @Schema(description = "支付网关订单号")
+    private String gatewayOrderNo;
 
     @Schema(description = "异步支付方式")
     private boolean async;
 
+    @Schema(description = "订单金额")
+    private Integer totalAmount;
+
     @Schema(description = "退款金额")
     private Integer amount;
 }

daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/order/RefundOrderResult.java

@@ -42,8 +42,8 @@ public class RefundOrderResult {
     @Schema(description = "退款时间")
     private LocalDateTime refundTime;
 
-    @Schema(description = "支付退款通道明细数据")
-    private List<RefundOrderChannelResult> channels;
+    @Schema(description = "通道退款订单")
+    private List<RefundChannelOrderResult> channels;
 
     /**
      * @see PayRefundStatusEnum

daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/PayResult.java

@@ -6,6 +6,7 @@ import cn.bootx.platform.daxpay.result.CommonResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 统一下单响应参数
@@ -14,6 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
+@Accessors(chain = true)
 @Schema(title = "统一下单响应参数")
 public class PayResult extends CommonResult {
 

daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/result/pay/RefundResult.java

@@ -4,6 +4,7 @@ import cn.bootx.platform.daxpay.result.CommonResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 退款响应参数
@@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
+@Accessors(chain = true)
 @Schema(title = "退款响应参数")
 public class RefundResult extends CommonResult {
 
@@ -20,8 +22,4 @@ public class RefundResult extends CommonResult {
 
     @Schema(description = "退款订单号, 如果请求时未传, 则默认使用退款ID")
     private String refundNo;
-
-    @Schema(description = "退款状态")
-    private String state;
-
 }