From 441cadbb7121dbf6e7d349c01cfbff6d46439cb0 Mon Sep 17 00:00:00 2001 From: bootx Date: Mon, 15 Jan 2024 23:01:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E4=BB=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daxpay/param/pay/QueryPayOrderParam.java | 23 +++++++++++++++++++ .../param/pay/QueryRefundOrderParam.java | 23 +++++++++++++++++++ .../daxpay/param/pay/SimpleRefundParam.java | 2 +- .../gateway/controller/UniPayController.java | 12 ++++++++-- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayOrderParam.java create mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundOrderParam.java diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayOrderParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayOrderParam.java new file mode 100644 index 00000000..19e6224a --- /dev/null +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayOrderParam.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.daxpay.param.pay; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 支付订单查询参数 + * @author xxm + * @since 2024/1/15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "支付订单查询参数") +public class QueryPayOrderParam extends PayCommonParam{ + + @Schema(description = "支付号") + private Long paymentId; + + @Schema(description = "业务号") + private String businessNo; + +} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundOrderParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundOrderParam.java new file mode 100644 index 00000000..f95bc7c7 --- /dev/null +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundOrderParam.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.daxpay.param.pay; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 查询退款订单参数 + * @author xxm + * @since 2024/1/15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "查询退款订单参数") +public class QueryRefundOrderParam extends PayCommonParam { + + @Schema(description = "退款订单ID") + private Long refundId; + + @Schema(description = "退款订单号") + private String refundNo; + +} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimpleRefundParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimpleRefundParam.java index 929edd5b..40755de7 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimpleRefundParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimpleRefundParam.java @@ -30,7 +30,7 @@ public class SimpleRefundParam extends PayCommonParam { private String businessNo; /** - * 部分退款时此项必填 + * 部分退款时此项必填, 不传输系统会自动生成 */ @Schema(description = "退款订单号") private String refundNo; diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java index 5ce29ab9..3d83a059 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniPayController.java @@ -96,7 +96,7 @@ public class UniPayController { @PaymentApi("queryPayOrder") @Operation(summary = "查询支付订单") @PostMapping("/queryPayOrder") - public DaxResult queryPayOrder(){ + public DaxResult queryPayOrder(@RequestBody QueryPayOrderParam param){ return DaxRes.ok(); } @@ -104,7 +104,15 @@ public class UniPayController { @PaymentApi("queryRefundOrder") @Operation(summary = "查询退款订单") @PostMapping("/queryRefundOrder") - public DaxResult queryRefundOrder(){ + public DaxResult queryRefundOrder(@RequestBody QueryRefundOrderParam param){ + return DaxRes.ok(); + } + + @CountTime + @PaymentApi("queryRefundOrderList") + @Operation(summary = "批量查询退款订单",description = "根据支付单号或者支付业务号") + @PostMapping("/queryRefundOrderList") + public DaxResult queryRefundOrderList(@RequestBody QueryPayOrderParam param){ return DaxRes.ok(); } }