From a54c6297b0637bb63ea5d1dfc5e77e2b8555604e Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 21 Jul 2024 21:22:12 +0800 Subject: [PATCH] =?UTF-8?q?doc=20=E6=B3=A8=E9=87=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alipay/service/AliPayCloseService.java | 4 ++-- .../dto/record/close/PayCloseRecordDto.java | 17 ++++++++--------- .../param/record/PayCloseRecordQuery.java | 15 +++++++-------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCloseService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCloseService.java index 81822a7d9..0b008ce98 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCloseService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/channel/alipay/service/AliPayCloseService.java @@ -71,9 +71,9 @@ public class AliPayCloseService { } } - /** - * 交易撤销: 如果用户支付成功，会将此订单资金退还给用户. 限制时间为1天，过了24小时，该接口无法再使用。 + /**交易撤销: 如果用户支付成功，会将此订单资金退还给用户. 限制时间为1天，过了24小时，该接口无法再使用。 * 可以视为一个特殊的接口, 需要专门签约这个接口的权限 + * */ public void cancel(PayOrder payOrder, AliPayConfig config) { diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/record/close/PayCloseRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/record/close/PayCloseRecordDto.java index 4c7409469..36b2f137b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/record/close/PayCloseRecordDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/record/close/PayCloseRecordDto.java @@ -2,7 +2,6 @@ package cn.daxpay.single.service.dto.record.close; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.daxpay.single.core.code.PayChannelEnum; -import cn.bootx.table.modify.annotation.DbColumn; import cn.daxpay.single.service.code.PayCloseTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -21,42 +20,42 @@ import lombok.experimental.Accessors; public class PayCloseRecordDto extends BaseDto { /** 订单号 */ - @DbColumn(comment = "订单号") + @Schema(description = "订单号") private String orderNo; /** 商户订单号 */ - @DbColumn(comment = "商户订单号") + @Schema(description = "商户订单号") private String bizOrderNo; /** * 关闭的支付通道 * @see PayChannelEnum */ - @DbColumn(comment = "关闭的异步支付通道") + @Schema(description = "关闭的异步支付通道") private String channel; /** * 关闭类型 关闭/撤销 * @see PayCloseTypeEnum */ - @DbColumn(comment = "关闭类型") + @Schema(description = "关闭类型") private String closeType; /** * 是否关闭成功 */ - @DbColumn(comment = "是否关闭成功") + @Schema(description = "是否关闭成功") private boolean closed; /** 错误码 */ - @DbColumn(comment = "错误码", length = 10) + @Schema(description = "错误码") private String errorCode; /** 错误信息 */ - @DbColumn(comment = "错误信息", length = 2048) + @Schema(description = "错误信息") private String errorMsg; /** 终端ip */ - @DbColumn(comment = "支付终端ip", length = 64) + @Schema(description = "支付终端ip") private String clientIp; } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/record/PayCloseRecordQuery.java b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/record/PayCloseRecordQuery.java index 0c90b2f5d..d3c975696 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/record/PayCloseRecordQuery.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/record/PayCloseRecordQuery.java @@ -2,7 +2,6 @@ package cn.daxpay.single.service.param.record; import cn.bootx.platform.common.core.rest.param.QueryOrder; import cn.daxpay.single.core.code.PayChannelEnum; -import cn.bootx.table.modify.annotation.DbColumn; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,35 +19,35 @@ import lombok.experimental.Accessors; public class PayCloseRecordQuery extends QueryOrder { /** 订单号 */ - @DbColumn(comment = "订单号") + @Schema(description = "订单号") private String orderNo; /** 商户订单号 */ - @DbColumn(comment = "商户订单号") + @Schema(description = "商户订单号") private String bizOrderNo; /** * 关闭的支付通道 * @see PayChannelEnum */ - @DbColumn(comment = "关闭的支付通道") + @Schema(description = "关闭的支付通道") private String channel; /** * 是否关闭成功 */ - @DbColumn(comment = "是否关闭成功") + @Schema(description = "是否关闭成功") private Boolean closed; /** 错误码 */ - @DbColumn(comment = "错误码") + @Schema(description = "错误码") private String errorCode; /** 错误消息 */ - @DbColumn(comment = "错误消息") + @Schema(description = "错误消息") private String errorMsg; /** 终端ip */ - @DbColumn(comment = "支付终端ip", length = 64) + @Schema(description = "支付终端ip") private String clientIp; }