From c9bed94a7649f4f58fe2818eb45580f3324cb809 Mon Sep 17 00:00:00 2001 From: bootx Date: Thu, 18 Apr 2024 23:24:34 +0800 Subject: [PATCH] =?UTF-8?q?ref=20=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8F=82=E6=95=B0=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../allocation/AllocationOrderController.java | 8 +-- .../controller/order/PayOrderController.java | 6 +- .../order/RefundOrderController.java | 2 +- .../daxpay/param/pay/PayChannelParam.java | 51 ------------- .../platform/daxpay/param/pay/PayParam.java | 69 ------------------ .../daxpay/param/pay/QueryPayOrderParam.java | 24 ------- .../param/pay/QueryRefundOrderParam.java | 24 ------- .../daxpay/param/pay/RefundChannelParam.java | 34 --------- .../daxpay/param/pay/RefundParam.java | 61 ---------------- .../daxpay/param/pay/SimpleRefundParam.java | 71 ------------------ .../allocation/AllocationFinishParam.java | 2 +- .../allocation/AllocationResetParam.java | 2 +- .../allocation/AllocationStartParam.java | 2 +- .../allocation}/AllocationSyncParam.java | 10 +-- .../allocation/QueryAllocationOrderParam.java | 2 +- .../param/payment/pay/PayCancelParam.java | 24 +++++++ .../{ => payment}/pay/PayCloseParam.java | 14 ++-- .../pay/PayParam.java} | 22 +++--- .../param/{ => payment}/pay/PaySyncParam.java | 8 +-- .../{ => payment}/pay/QueryPayParam.java | 8 +-- .../refund}/QueryRefundParam.java | 10 +-- .../param/payment/refund/RefundParam.java | 72 +++++++++++++++++++ .../refund}/RefundSyncParam.java | 16 ++--- .../bootx/platform/daxpay/util/PayUtil.java | 3 +- .../gateway/controller/UniPayController.java | 10 ++- .../controller/UniQueryController.java | 4 +- daxpay-single/daxpay-single-service/pom.xml | 5 -- .../channel/alipay/service/AliPayService.java | 1 - .../union/service/UnionPayService.java | 1 - .../wechat/service/WeChatPayService.java | 1 - .../service/AllocationOrderService.java | 2 +- .../core/order/pay/builder/PayBuilder.java | 3 +- .../pay/service/PayChannelOrderService.java | 1 - .../pay/service/PayOrderQueryService.java | 2 +- .../refund/service/RefundOrderService.java | 4 +- .../allocation/service/AllocationService.java | 8 +-- .../close/service/PayCloseService.java | 2 +- .../pay/factory/PayStrategyFactory.java | 1 - .../payment/pay/service/PayAssistService.java | 3 +- .../core/payment/pay/service/PayService.java | 24 ++----- .../payment/pay/strategy/AliPayStrategy.java | 1 - .../pay/strategy/UnionPayStrategy.java | 1 - .../pay/strategy/WeChatPayStrategy.java | 1 - .../refund/factory/RefundStrategyFactory.java | 1 - .../refund/service/RefundAssistService.java | 3 +- .../payment/refund/service/RefundService.java | 4 +- .../payment/sync/service/PaySyncService.java | 2 +- .../sync/service/RefundSyncService.java | 2 +- .../daxpay/service/func/AbsPayStrategy.java | 3 +- .../service/func/AbsRefundStrategy.java | 1 - .../param/order/PayOrderRefundParam.java | 1 - .../service/task/PayExpiredTimeTask.java | 2 +- .../daxpay/core/util/PayParamSignTest.java | 3 +- 54 files changed, 181 insertions(+), 462 deletions(-) delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayChannelParam.java delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayOrderParam.java delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundOrderParam.java delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundChannelParam.java delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundParam.java delete mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimpleRefundParam.java rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment}/allocation/AllocationFinishParam.java (89%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment}/allocation/AllocationResetParam.java (87%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment}/allocation/AllocationStartParam.java (93%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment/allocation}/AllocationSyncParam.java (59%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment}/allocation/QueryAllocationOrderParam.java (90%) create mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCancelParam.java rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{ => payment}/pay/PayCloseParam.java (57%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay/SimplePayParam.java => payment/pay/PayParam.java} (85%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{ => payment}/pay/PaySyncParam.java (73%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{ => payment}/pay/QueryPayParam.java (73%) rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment/refund}/QueryRefundParam.java (71%) create mode 100644 daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundParam.java rename daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/{pay => payment/refund}/RefundSyncParam.java (51%) diff --git a/README.md b/README.md index a8bc1337a..8c90ccc82 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ > DaxPay是一套基于Bootx-Platform脚手架构建的开源支付网关系统，已经对接支付宝、微信支付相关的接口，以及扩展了钱包支付、储值卡支付、现金支付等新的支付方式。 > 可以独立部署，提供接口供业务系统进行调用，不对原有系统产生影响 +> **gateway为开发分支，本地运行请使用master分支进行测试** ## 🧭 特色功能 - 封装各类支付通道的接口为统一的接口，方便业务系统进行调用，简化对接多种支付方式的复杂度 - 已对接`微信支付`、`支付宝`和云闪付相关的接口，后续版本将支持`V3`版本的接口 diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationOrderController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationOrderController.java index 1dd02a2e8..fd4ff70ba 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationOrderController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/allocation/AllocationOrderController.java @@ -5,9 +5,9 @@ import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.dto.LabelValue; import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.daxpay.param.pay.AllocationSyncParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationFinishParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationResetParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationSyncParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationFinishParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationResetParam; import cn.bootx.platform.daxpay.service.core.order.allocation.service.AllocationOrderService; import cn.bootx.platform.daxpay.service.core.payment.allocation.service.AllocationService; import cn.bootx.platform.daxpay.service.dto.order.allocation.AllocationOrderDetailDto; @@ -72,7 +72,7 @@ public class AllocationOrderController { @Operation(summary = "同步分账结果") @PostMapping("/sync") public ResResult sync(Long id){ - AllocationSyncParam param = new AllocationSyncParam(); + AllocationSyncParam param = new AllocationSyncParam(); param.setAllocationId(id); allocationService.sync(param); return Res.ok(); diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/PayOrderController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/PayOrderController.java index 9e5d446da..4c3bcc2cf 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/PayOrderController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/PayOrderController.java @@ -5,9 +5,9 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.daxpay.param.pay.PayCloseParam; -import cn.bootx.platform.daxpay.param.pay.PaySyncParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationStartParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayCloseParam; +import cn.bootx.platform.daxpay.param.payment.pay.PaySyncParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationStartParam; import cn.bootx.platform.daxpay.result.pay.SyncResult; import cn.bootx.platform.daxpay.service.core.order.pay.entity.PayOrder; import cn.bootx.platform.daxpay.service.core.order.pay.service.PayChannelOrderService; diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/RefundOrderController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/RefundOrderController.java index 9d312a05a..69a29d598 100644 --- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/RefundOrderController.java +++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/order/RefundOrderController.java @@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.daxpay.param.pay.RefundSyncParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundSyncParam; import cn.bootx.platform.daxpay.result.pay.SyncResult; import cn.bootx.platform.daxpay.service.core.order.refund.service.RefundOrderService; import cn.bootx.platform.daxpay.service.core.payment.refund.service.RefundService; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayChannelParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayChannelParam.java deleted file mode 100644 index 963286831..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayChannelParam.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.code.PayChannelEnum; -import cn.bootx.platform.daxpay.code.PayWayEnum; -import cn.bootx.platform.daxpay.param.channel.*; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Map; - -/** - * 同意下单支付方式参数 - * - * @author xxm - * @since 2020/12/8 - */ -@Data -@Schema(title = "支付通道参数") -public class PayChannelParam { - - /** - * @see PayChannelEnum#getCode() - */ - @Schema(description = "支付通道编码") - @NotBlank(message = "支付通道编码不可为空") - private String channel; - - /** - * @see PayWayEnum#getCode() - */ - @Schema(description = "支付方式编码") - @NotBlank(message = "支付方式编码不可为空") - private String way; - - @Schema(description = "支付金额") - @NotNull(message = "支付金额不可为空") - private Integer amount; - - /** - * 附加支付参数, 传输json格式字符串 - * @see AliPayParam - * @see WeChatPayParam - * @see VoucherPayParam - * @see WalletPayParam - * @see UnionPayParam - */ - @Schema(description = "附加支付参数") - private Map channelParam; -} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java deleted file mode 100644 index 027b5e9ed..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayParam.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.param.PaymentCommonParam; -import cn.bootx.platform.daxpay.serializer.TimestampToLocalDateTimeDeserializer; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.List; - -/** - * 统一下单参数 - * - * @author xxm - * @since 2020/12/9 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "支付参数") -public class PayParam extends PaymentCommonParam { - - @Schema(description = "业务号") - @NotBlank(message = "业务号不可为空") - private String businessNo; - - @Schema(description = "支付标题") - @NotBlank(message = "支付标题不可为空") - private String title; - - @Schema(description = "支付描述") - private String description; - - @Schema(description = "是否开启分账") - private boolean allocation; - - @Schema(description = "过期时间, 多次传输以第一次为准") - @JsonDeserialize(using = TimestampToLocalDateTimeDeserializer.class) - private LocalDateTime expiredTime; - - @Schema(description = "用户付款中途退出返回商户网站的地址(部分支付场景中可用)") - private String quitUrl; - - @Schema(description = "支付通道信息参数") - @NotNull(message = "支付通道信息参数不可为空") - @Valid - private List payChannels; - - /** 商户扩展参数,回调时会原样返回 */ - @Schema(description = "商户扩展参数,回调时会原样返回") - private String attach; - - /** 同步跳转URL, 不传输跳转到默认地址 */ - @Schema(description = "同步跳转URL") - private String returnUrl; - - - /** 是否不启用异步通知 */ - @Schema(description = "是否不启用异步通知") - private boolean notNotify; - - /** 异步通知地址 */ - @Schema(description = "异步通知地址") - private String notifyUrl; -} 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 deleted file mode 100644 index 422f9859e..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayOrderParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.param.PaymentCommonParam; -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 PaymentCommonParam { - - @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 deleted file mode 100644 index 9197cbaf8..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundOrderParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.param.PaymentCommonParam; -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 PaymentCommonParam { - - @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/RefundChannelParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundChannelParam.java deleted file mode 100644 index 90e5b0d19..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundChannelParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.code.PayChannelEnum; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * 分通道退款参数 - * @author xxm - * @since 2023/12/18 - */ -@Data -@Accessors(chain = true) -@Schema(title = "分通道退款参数") -public class RefundChannelParam { - - /** - * @see PayChannelEnum#getCode() - */ - @Schema(description = "支付通道编码") - @NotBlank(message = "支付通道编码不可为空") - private String channel; - - @Schema(description = "退款金额") - @NotNull(message = "退款金额不可为空") - @Min(1) - private Integer amount; - -} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundParam.java deleted file mode 100644 index c25a552d2..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundParam.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.param.PaymentCommonParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.validation.Valid; -import java.util.List; - -/** - * 退款参数，适用于组合支付的订单退款操作中， - * @author xxm - * @since 2023/12/18 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "退款参数") -public class RefundParam extends PaymentCommonParam { - - @Schema(description = "支付单ID") - private Long paymentId; - - @Schema(description = "业务号") - private String businessNo; - - /** - * 部分退款需要传输支付通道参数参数 - */ - @Schema(description = "是否全部退款") - private boolean refundAll; - - /** - * 退款号可以为空, 但不可以重复, 如果退款号为空, 则系统会自动生成退款号, 与退款ID一致 - */ - @Schema(description = "退款号") - private String refundNo; - - /** - * 部分退款时必传 - */ - @Valid - @Schema(description = "退款参数列表") - private List refundChannels; - - @Schema(description = "退款原因") - private String reason; - - /** 商户扩展参数,回调时会原样返回 */ - @Schema(description = "商户扩展参数,回调时会原样返回") - private String attach; - - /** 是否不启用异步通知 */ - @Schema(description = "是否不启用异步通知") - private boolean notNotify; - - /** 异步通知地址 */ - @Schema(description = "异步通知地址") - private String notifyUrl; - -} 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 deleted file mode 100644 index 400d18328..000000000 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimpleRefundParam.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.bootx.platform.daxpay.param.pay; - -import cn.bootx.platform.daxpay.param.PaymentCommonParam; -import cn.bootx.platform.daxpay.param.channel.AliPayParam; -import cn.bootx.platform.daxpay.param.channel.WalletPayParam; -import cn.bootx.platform.daxpay.param.channel.WeChatPayParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 简单退款参数，只可以用于非组合的支付订单 - * @author xxm - * @since 2023/12/18 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(title = "简单退款参数") -public class SimpleRefundParam extends PaymentCommonParam { - - /** - * 优先级高于业务号 - */ - @Schema(description = "支付单ID") - private Long paymentId; - - @Schema(description = "业务号") - private String businessNo; - - /** - * 部分退款时此项必填, 不传输系统会自动生成 - */ - @Schema(description = "退款订单号") - private String refundNo; - - /** - * 部分退款需要传输refundModes参数 - */ - @Schema(description = "是否全部退款") - private boolean refundAll; - - - @Schema(description = "退款金额") - private Integer amount; - - /** - * 预留的扩展参数, 暂时未使用 - * @see AliPayParam - * @see WeChatPayParam - * @see VoucherPayParam - * @see WalletPayParam - */ - @Schema(description = "附加退款参数") - private String channelExtra; - - @Schema(description = "退款原因") - private String reason; - - - /** 商户扩展参数,回调时会原样返回 */ - @Schema(description = "商户扩展参数,回调时会原样返回") - private String attach; - - /** 是否不启用异步通知 */ - @Schema(description = "是否不启用异步通知") - private boolean notNotify; - - /** 异步通知地址 */ - @Schema(description = "异步通知地址") - private String notifyUrl; -} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationFinishParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationFinishParam.java similarity index 89% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationFinishParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationFinishParam.java index c6c224bb5..a5583b1e8 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationFinishParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationFinishParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay.allocation; +package cn.bootx.platform.daxpay.param.payment.allocation; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationResetParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationResetParam.java similarity index 87% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationResetParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationResetParam.java index 3dbf900c8..b0dce307a 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationResetParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationResetParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay.allocation; +package cn.bootx.platform.daxpay.param.payment.allocation; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationStartParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationStartParam.java similarity index 93% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationStartParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationStartParam.java index 61397a186..c3d80efe4 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/AllocationStartParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationStartParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay.allocation; +package cn.bootx.platform.daxpay.param.payment.allocation; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/AllocationSyncParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationSyncParam.java similarity index 59% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/AllocationSyncParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationSyncParam.java index b49314d21..368623549 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/AllocationSyncParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/AllocationSyncParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.allocation; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -12,9 +12,9 @@ import lombok.Data; @Schema(title = "分账同步请求参数") public class AllocationSyncParam { - @Schema(description = "分账单ID") - private Long allocationId; - - @Schema(description = "分账单号") + @Schema(description = "分账号") private String allocationNo; + + @Schema(description = "商户分账号") + private String outAllocationNo; } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/QueryAllocationOrderParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/QueryAllocationOrderParam.java similarity index 90% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/QueryAllocationOrderParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/QueryAllocationOrderParam.java index 911dc63cc..9842279da 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/allocation/QueryAllocationOrderParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/allocation/QueryAllocationOrderParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay.allocation; +package cn.bootx.platform.daxpay.param.payment.allocation; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCancelParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCancelParam.java new file mode 100644 index 000000000..9ad177a29 --- /dev/null +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCancelParam.java @@ -0,0 +1,24 @@ +package cn.bootx.platform.daxpay.param.payment.pay; + +import cn.bootx.platform.daxpay.param.PaymentCommonParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 支付订单撤销 + * 并不是所有的订单都可以被撤销，只有部分类型的支持撤销，主要是当面付 + * @author xxm + * @since 2024/4/18 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "支付订单撤销") +public class PayCancelParam extends PaymentCommonParam { + + @Schema(description = "订单号") + private String orderNo; + + @Schema(description = "商户订单号") + private String outTradeNo; +} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCloseParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCloseParam.java similarity index 57% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCloseParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCloseParam.java index a58e56128..d28a9aae9 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PayCloseParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayCloseParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.pay; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,13 +15,9 @@ import lombok.EqualsAndHashCode; @Schema(title = "支付关闭参数") public class PayCloseParam extends PaymentCommonParam { - @Schema(description = "支付单ID") - private Long paymentId; - - @Schema(description = "业务号") - private String businessNo; - - @Schema(description = "使用撤销来关闭订单") - private Boolean cancel; + @Schema(description = "订单号") + private String orderNo; + @Schema(description = "商户订单号") + private String outTradeNo; } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayParam.java similarity index 85% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayParam.java index 301d6838f..e9f5b33be 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/SimplePayParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PayParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.pay; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayWayEnum; @@ -19,18 +19,19 @@ import java.time.LocalDateTime; import java.util.Map; /** - * 简单下单参数 + * 统一下单参数 + * * @author xxm - * @since 2023/12/17 + * @since 2020/12/9 */ @EqualsAndHashCode(callSuper = true) @Data -@Schema(title = "简单下单参数") -public class SimplePayParam extends PaymentCommonParam { +@Schema(title = "支付参数") +public class PayParam extends PaymentCommonParam { - @Schema(description = "业务号") - @NotBlank(message = "业务号不可为空") - private String businessNo; + @Schema(description = "商户订单号") + @NotBlank(message = "商户订单号不可为空") + private String outTradeNo; @Schema(description = "支付标题") @NotBlank(message = "支付标题不可为空") @@ -61,7 +62,7 @@ public class SimplePayParam extends PaymentCommonParam { */ @Schema(description = "支付方式编码") @NotBlank(message = "支付方式编码不可为空") - private String payWay; + private String way; @Schema(description = "支付金额") @NotNull(message = "支付金额不可为空") @@ -71,7 +72,6 @@ public class SimplePayParam extends PaymentCommonParam { /** * @see AliPayParam * @see WeChatPayParam - * @see VoucherPayParam * @see WalletPayParam */ @Schema(description = "附加通道支付参数") @@ -81,7 +81,7 @@ public class SimplePayParam extends PaymentCommonParam { @Schema(description = "商户扩展参数,回调时会原样返回") private String attach; - /** 同步跳转URL, 不传输跳转到默认地址 */ + /** 同步跳转URL, 支付完毕后用户浏览器返回到该地址, 不传输跳转到默认地址 */ @Schema(description = "同步通知URL") private String returnUrl; diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PaySyncParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PaySyncParam.java similarity index 73% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PaySyncParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PaySyncParam.java index 16cad3b95..b9ec8ed9f 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/PaySyncParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/PaySyncParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.pay; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,10 +15,10 @@ import lombok.EqualsAndHashCode; @Schema(title = "支付状态同步参数") public class PaySyncParam extends PaymentCommonParam { - @Schema(description = "支付单ID") - private Long paymentId; + @Schema(description = "订单号") + private String orderNo; @Schema(description = "业务号") - private String businessNo; + private String outTradeNo; } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/QueryPayParam.java similarity index 73% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/QueryPayParam.java index 0676b174c..18976c611 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryPayParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/pay/QueryPayParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.pay; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,9 +15,9 @@ import lombok.EqualsAndHashCode; @Schema(title = "支付单查询参数") public class QueryPayParam extends PaymentCommonParam { - @Schema(description = "支付单ID") - private Long paymentId; + @Schema(description = "订单号") + private String orderNo; @Schema(description = "商户订单号") - private String businessNo; + private String outTradeNo; } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/QueryRefundParam.java similarity index 71% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/QueryRefundParam.java index 01556dde3..0e3dd2966 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/QueryRefundParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/QueryRefundParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.refund; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,9 +15,9 @@ import lombok.EqualsAndHashCode; @Schema(title = "查询退款订单参数类") public class QueryRefundParam extends PaymentCommonParam { - @Schema(description = "退款订单ID") - private Long refundId; - - @Schema(description = "退款订单号") + @Schema(description = "退款号") private String refundNo; + + @Schema(description = "商户退款号") + private String outRefundNo; } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundParam.java new file mode 100644 index 000000000..323d40ce4 --- /dev/null +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundParam.java @@ -0,0 +1,72 @@ +package cn.bootx.platform.daxpay.param.payment.refund; + +import cn.bootx.platform.daxpay.param.PaymentCommonParam; +import cn.bootx.platform.daxpay.param.channel.AliPayParam; +import cn.bootx.platform.daxpay.param.channel.WalletPayParam; +import cn.bootx.platform.daxpay.param.channel.WeChatPayParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * 退款参数，适用于组合支付的订单退款操作中， + * @author xxm + * @since 2023/12/18 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "退款参数") +public class RefundParam extends PaymentCommonParam { + + /** + * 商户退款号，不可以为空，同样的商户退款号多次请求，同一退款单号多次请求只退一笔 + */ + @Schema(description = "商户退款号") + @NotBlank(message = "商户退款号不可为空") + private String outRefundNo; + + /** + * 支付操作是返回的订单号，与商户订单号至少要传输一个，同时传输以订单号为准 + */ + @Schema(description = "订单号") + private String orderNo; + + /** + * 支付操作时传入的的商户订单号，与订单号至少要传输一个，同时传输以订单号为准 + */ + @Schema(description = "商户订单号") + private String outTradeNo; + + @Schema(description = "退款金额") + @Min(value = 1,message = "退款金额至少为0.01元") + private Integer amount; + + /** + * 预留的退款扩展参数 + * @see AliPayParam + * @see WeChatPayParam + * @see WalletPayParam + */ + @Schema(description = "退款扩展参数") + private Map channelParam; + + @Schema(description = "退款原因") + private String reason; + + /** 商户扩展参数,回调时会原样返回 */ + @Schema(description = "商户扩展参数,回调时会原样返回") + private String attach; + + /** 是否不启用异步通知 */ + @Schema(description = "是否不启用异步通知") + private boolean notNotify; + + /** 异步通知地址 */ + @Schema(description = "异步通知地址") + private String notifyUrl; + +} diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundSyncParam.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundSyncParam.java similarity index 51% rename from daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundSyncParam.java rename to daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundSyncParam.java index befcaee0d..2c9436e08 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/pay/RefundSyncParam.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/param/payment/refund/RefundSyncParam.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.daxpay.param.pay; +package cn.bootx.platform.daxpay.param.payment.refund; import cn.bootx.platform.daxpay.param.PaymentCommonParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,16 +15,10 @@ import lombok.EqualsAndHashCode; @Schema(title = "退款状态同步参数") public class RefundSyncParam extends PaymentCommonParam { - /** - * 退款订单ID，refundId和refundNo 必传一个, 同时传输时，以 refundId 为准 - */ - @Schema(description = "退款订单ID") - private Long refundId; - - /** - * 退款订单号，refundId和refundNo 必传一个，同时传输时，以 refundId 为准 - */ - @Schema(description = "退款订单号") + @Schema(description = "退款号") private String refundNo; + @Schema(description = "商户退款号") + private String outRefundNo; + } diff --git a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java index 2ae9b1487..b29c307bf 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java +++ b/daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/util/PayUtil.java @@ -4,8 +4,7 @@ import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; -import cn.bootx.platform.daxpay.param.pay.PayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; import cn.hutool.core.date.DatePattern; import lombok.experimental.UtilityClass; 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 a6ecb9df9..a15bd75f8 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 @@ -3,9 +3,13 @@ package cn.bootx.platform.daxpay.gateway.controller; import cn.bootx.platform.common.core.annotation.CountTime; import cn.bootx.platform.common.core.annotation.IgnoreAuth; import cn.bootx.platform.daxpay.code.PaymentApiCode; -import cn.bootx.platform.daxpay.param.pay.*; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationFinishParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationStartParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationFinishParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationStartParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayCloseParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PaySyncParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundSyncParam; import cn.bootx.platform.daxpay.result.DaxResult; import cn.bootx.platform.daxpay.result.allocation.AllocationResult; import cn.bootx.platform.daxpay.result.pay.PayResult; diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniQueryController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniQueryController.java index b0e004707..371f1c334 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniQueryController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/UniQueryController.java @@ -3,8 +3,8 @@ package cn.bootx.platform.daxpay.gateway.controller; import cn.bootx.platform.common.core.annotation.CountTime; import cn.bootx.platform.common.core.annotation.IgnoreAuth; import cn.bootx.platform.daxpay.code.PaymentApiCode; -import cn.bootx.platform.daxpay.param.pay.QueryPayParam; -import cn.bootx.platform.daxpay.param.pay.QueryRefundParam; +import cn.bootx.platform.daxpay.param.payment.pay.QueryPayParam; +import cn.bootx.platform.daxpay.param.payment.refund.QueryRefundParam; import cn.bootx.platform.daxpay.result.DaxResult; import cn.bootx.platform.daxpay.result.order.PayOrderResult; import cn.bootx.platform.daxpay.result.order.RefundOrderResult; diff --git a/daxpay-single/daxpay-single-service/pom.xml b/daxpay-single/daxpay-single-service/pom.xml index 81dd9f176..e1d680172 100644 --- a/daxpay-single/daxpay-single-service/pom.xml +++ b/daxpay-single/daxpay-single-service/pom.xml @@ -133,10 +133,5 @@ lock4j-redis-template-spring-boot-starter ${lock4j.version} - - org.postgresql - postgresql - runtime - diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayService.java index da9866d33..1341daf3d 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayService.java @@ -3,7 +3,6 @@ package cn.bootx.platform.daxpay.service.core.channel.alipay.service; import cn.bootx.platform.daxpay.code.PayWayEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.channel.AliPayParam; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.code.AliPayCode; import cn.bootx.platform.daxpay.service.code.AliPayWay; import cn.bootx.platform.daxpay.service.common.context.PayLocal; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java index 090b433a0..6257700f6 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java @@ -3,7 +3,6 @@ package cn.bootx.platform.daxpay.service.core.channel.union.service; import cn.bootx.platform.daxpay.code.PayWayEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.channel.UnionPayParam; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.code.UnionPayCode; import cn.bootx.platform.daxpay.service.code.UnionPayWay; import cn.bootx.platform.daxpay.service.common.context.PayLocal; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java index d204ebf4f..198cbb0a5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayService.java @@ -6,7 +6,6 @@ import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.common.spring.exception.RetryableException; import cn.bootx.platform.daxpay.code.PayWayEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.result.pay.SyncResult; import cn.bootx.platform.daxpay.service.code.WeChatPayCode; import cn.bootx.platform.daxpay.service.code.WeChatPayWay; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/allocation/service/AllocationOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/allocation/service/AllocationOrderService.java index 1fa37a63a..3038f8932 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/allocation/service/AllocationOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/allocation/service/AllocationOrderService.java @@ -10,7 +10,7 @@ import cn.bootx.platform.daxpay.code.AllocationDetailResultEnum; import cn.bootx.platform.daxpay.code.AllocationOrderStatusEnum; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayOrderAllocationStatusEnum; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationStartParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationStartParam; import cn.bootx.platform.daxpay.service.core.order.allocation.dao.AllocationOrderDetailManager; import cn.bootx.platform.daxpay.service.core.order.allocation.dao.AllocationOrderManager; import cn.bootx.platform.daxpay.service.core.order.allocation.entity.AllocationOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/builder/PayBuilder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/builder/PayBuilder.java index b3bfc25bb..3dd71c861 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/builder/PayBuilder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/builder/PayBuilder.java @@ -3,8 +3,7 @@ package cn.bootx.platform.daxpay.service.core.order.pay.builder; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayOrderAllocationStatusEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; -import cn.bootx.platform.daxpay.param.pay.PayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; import cn.bootx.platform.daxpay.result.pay.PayResult; import cn.bootx.platform.daxpay.service.common.context.ApiInfoLocal; import cn.bootx.platform.daxpay.service.common.context.PayLocal; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayChannelOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayChannelOrderService.java index 2de4e6791..cfb0f9b4e 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayChannelOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayChannelOrderService.java @@ -4,7 +4,6 @@ import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.util.ResultConvertUtil; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.RefundStatusEnum; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.common.context.PayLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.order.pay.dao.PayChannelOrderManager; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayOrderQueryService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayOrderQueryService.java index aa25f1c87..6522dfd49 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayOrderQueryService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/pay/service/PayOrderQueryService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.QueryPayParam; +import cn.bootx.platform.daxpay.param.payment.pay.QueryPayParam; import cn.bootx.platform.daxpay.result.order.PayChannelOrderResult; import cn.bootx.platform.daxpay.result.order.PayOrderResult; import cn.bootx.platform.daxpay.service.core.order.pay.convert.PayOrderConvert; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/service/RefundOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/service/RefundOrderService.java index 2368ec3ba..9b161398a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/service/RefundOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/service/RefundOrderService.java @@ -7,8 +7,8 @@ import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.common.spring.util.WebServletUtil; import cn.bootx.platform.daxpay.code.PaymentApiCode; -import cn.bootx.platform.daxpay.param.pay.QueryRefundParam; -import cn.bootx.platform.daxpay.param.pay.RefundParam; +import cn.bootx.platform.daxpay.param.payment.refund.QueryRefundParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundParam; import cn.bootx.platform.daxpay.result.order.RefundChannelOrderResult; import cn.bootx.platform.daxpay.result.order.RefundOrderResult; import cn.bootx.platform.daxpay.service.core.order.refund.convert.RefundOrderChannelConvert; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationService.java index e259c9ac1..ece5b38cf 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/allocation/service/AllocationService.java @@ -6,10 +6,10 @@ import cn.bootx.platform.daxpay.code.AllocationOrderResultEnum; import cn.bootx.platform.daxpay.code.AllocationOrderStatusEnum; import cn.bootx.platform.daxpay.code.PayOrderAllocationStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.AllocationSyncParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationFinishParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationResetParam; -import cn.bootx.platform.daxpay.param.pay.allocation.AllocationStartParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationSyncParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationFinishParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationResetParam; +import cn.bootx.platform.daxpay.param.payment.allocation.AllocationStartParam; import cn.bootx.platform.daxpay.result.allocation.AllocationResult; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.order.allocation.dao.AllocationOrderDetailManager; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java index aadd73b92..98ad0fcd8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/service/PayCloseService.java @@ -5,7 +5,7 @@ import cn.bootx.platform.common.core.function.CollectorsFunction; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.param.pay.PayCloseParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayCloseParam; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.order.pay.dao.PayChannelOrderManager; import cn.bootx.platform.daxpay.service.core.order.pay.entity.PayChannelOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java index ac0d9d0d2..de4367e9f 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/factory/PayStrategyFactory.java @@ -2,7 +2,6 @@ package cn.bootx.platform.daxpay.service.core.payment.pay.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.core.payment.pay.strategy.*; import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import cn.hutool.core.collection.CollectionUtil; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java index e8b05b46d..ef788c387 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayAssistService.java @@ -3,8 +3,7 @@ package cn.bootx.platform.daxpay.service.core.payment.pay.service; import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; -import cn.bootx.platform.daxpay.param.pay.PayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; import cn.bootx.platform.daxpay.service.common.context.ApiInfoLocal; import cn.bootx.platform.daxpay.service.common.context.NoticeLocal; import cn.bootx.platform.daxpay.service.common.context.PayLocal; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java index 2236783c2..c145a3b02 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/service/PayService.java @@ -3,9 +3,7 @@ package cn.bootx.platform.daxpay.service.core.payment.pay.service; import cn.bootx.platform.common.core.exception.RepetitiveOperationException; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; -import cn.bootx.platform.daxpay.param.pay.PayParam; -import cn.bootx.platform.daxpay.param.pay.SimplePayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; import cn.bootx.platform.daxpay.result.pay.PayResult; import cn.bootx.platform.daxpay.service.common.context.PayLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; @@ -20,8 +18,6 @@ import cn.bootx.platform.daxpay.service.core.payment.notice.service.ClientNotice import cn.bootx.platform.daxpay.service.core.payment.pay.factory.PayStrategyFactory; import cn.bootx.platform.daxpay.service.func.AbsPayStrategy; import cn.bootx.platform.daxpay.util.PayUtil; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.lock.LockInfo; @@ -32,7 +28,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -67,21 +62,12 @@ public class PayService { /** - * 简单下单, 可以视为不支持组合支付的下单接口 + * 支付下单流程 */ public PayResult simplePay(SimplePayParam simplePayParam) { // 组装支付参数 - PayParam payParam = new PayParam(); - PayChannelParam payChannelParam = new PayChannelParam(); - payChannelParam.setChannel(simplePayParam.getChannel()); - payChannelParam.setWay(simplePayParam.getPayWay()); - payChannelParam.setAmount(simplePayParam.getAmount()); - payChannelParam.setChannelParam(simplePayParam.getChannelParam()); - BeanUtil.copyProperties(simplePayParam,payParam, CopyOptions.create().ignoreNullValue()); - payParam.setPayChannels(Collections.singletonList(payChannelParam)); - // 复用支付下单接口 - return this.pay(payParam); - } + return null; + } /** @@ -204,7 +190,7 @@ public class PayService { PayLocal payInfo = PaymentContextLocal.get().getPayInfo(); // 获取支付方式，通过工厂生成对应的策略组 - List strategies = PayStrategyFactory.createAsyncLast(payParam.getPayChannels()); + List strategies = PayStrategyFactory.createAsyncLast(payParam.getPayChannels()); if (CollectionUtil.isEmpty(strategies)) { throw new PayUnsupportedMethodException(); } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java index 961e69b97..cf3813877 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/AliPayStrategy.java @@ -4,7 +4,6 @@ import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.channel.AliPayParam; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.common.context.PayLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayConfig; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java index ed66a1acf..aafdd9961 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/UnionPayStrategy.java @@ -4,7 +4,6 @@ import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.param.channel.UnionPayParam; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.common.context.PayLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.channel.union.entity.UnionPayConfig; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java index 38621ac51..d14912cb8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WeChatPayStrategy.java @@ -2,7 +2,6 @@ package cn.bootx.platform.daxpay.service.core.payment.pay.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayAmountAbnormalException; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; import cn.bootx.platform.daxpay.service.common.context.PayLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.channel.wechat.entity.WeChatPayConfig; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/RefundStrategyFactory.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/RefundStrategyFactory.java index d691e62df..8968dc726 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/RefundStrategyFactory.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/factory/RefundStrategyFactory.java @@ -2,7 +2,6 @@ package cn.bootx.platform.daxpay.service.core.payment.refund.factory; import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; import cn.bootx.platform.daxpay.service.core.order.refund.entity.RefundChannelOrder; import cn.bootx.platform.daxpay.service.core.payment.refund.strategy.*; import cn.bootx.platform.daxpay.service.func.AbsRefundStrategy; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundAssistService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundAssistService.java index 6de33839a..74731f602 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundAssistService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundAssistService.java @@ -6,8 +6,7 @@ import cn.bootx.platform.daxpay.code.PayChannelEnum; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.RefundStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; -import cn.bootx.platform.daxpay.param.pay.RefundParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundParam; import cn.bootx.platform.daxpay.service.common.context.ApiInfoLocal; import cn.bootx.platform.daxpay.service.common.context.NoticeLocal; import cn.bootx.platform.daxpay.service.common.context.PlatformLocal; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundService.java index ce5dff95b..371552409 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/service/RefundService.java @@ -9,9 +9,7 @@ import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.RefundStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; import cn.bootx.platform.daxpay.exception.pay.PayUnsupportedMethodException; -import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; -import cn.bootx.platform.daxpay.param.pay.RefundParam; -import cn.bootx.platform.daxpay.param.pay.SimpleRefundParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundParam; import cn.bootx.platform.daxpay.result.pay.RefundResult; import cn.bootx.platform.daxpay.service.common.context.RefundLocal; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java index 5faa1faf9..f67d33332 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/PaySyncService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.util.LocalDateTimeUtil; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.PaySyncStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.PaySyncParam; +import cn.bootx.platform.daxpay.param.payment.pay.PaySyncParam; import cn.bootx.platform.daxpay.result.pay.SyncResult; import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; import cn.bootx.platform.daxpay.service.code.PayRepairWayEnum; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/RefundSyncService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/RefundSyncService.java index 31f36c505..20e16d067 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/RefundSyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/RefundSyncService.java @@ -5,7 +5,7 @@ import cn.bootx.platform.common.core.exception.RepetitiveOperationException; import cn.bootx.platform.daxpay.code.RefundStatusEnum; import cn.bootx.platform.daxpay.code.RefundSyncStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.RefundSyncParam; +import cn.bootx.platform.daxpay.param.payment.refund.RefundSyncParam; import cn.bootx.platform.daxpay.result.pay.SyncResult; import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; import cn.bootx.platform.daxpay.service.code.PaymentTypeEnum; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java index 3bc60eb3a..e4b572e9c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsPayStrategy.java @@ -1,8 +1,7 @@ package cn.bootx.platform.daxpay.service.func; import cn.bootx.platform.daxpay.code.PayStatusEnum; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; -import cn.bootx.platform.daxpay.param.pay.PayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; import cn.bootx.platform.daxpay.service.core.order.pay.builder.PayBuilder; import cn.bootx.platform.daxpay.service.core.order.pay.entity.PayChannelOrder; import cn.bootx.platform.daxpay.service.core.order.pay.entity.PayOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsRefundStrategy.java index 210d357b4..126a78535 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/func/AbsRefundStrategy.java @@ -3,7 +3,6 @@ package cn.bootx.platform.daxpay.service.func; import cn.bootx.platform.daxpay.code.PayStatusEnum; import cn.bootx.platform.daxpay.code.RefundStatusEnum; import cn.bootx.platform.daxpay.exception.pay.PayFailureException; -import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; import cn.bootx.platform.daxpay.service.core.order.pay.entity.PayChannelOrder; import cn.bootx.platform.daxpay.service.core.order.pay.entity.PayOrder; import cn.bootx.platform.daxpay.service.core.order.refund.entity.RefundChannelOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderRefundParam.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderRefundParam.java index 39f8b784e..b99fc7a12 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderRefundParam.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/param/order/PayOrderRefundParam.java @@ -1,6 +1,5 @@ package cn.bootx.platform.daxpay.service.param.order; -import cn.bootx.platform.daxpay.param.pay.RefundChannelParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/PayExpiredTimeTask.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/PayExpiredTimeTask.java index 70759ebf5..6304e072b 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/PayExpiredTimeTask.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/PayExpiredTimeTask.java @@ -1,6 +1,6 @@ package cn.bootx.platform.daxpay.service.task; -import cn.bootx.platform.daxpay.param.pay.PaySyncParam; +import cn.bootx.platform.daxpay.param.payment.pay.PaySyncParam; import cn.bootx.platform.daxpay.service.code.PayRepairSourceEnum; import cn.bootx.platform.daxpay.service.common.local.PaymentContextLocal; import cn.bootx.platform.daxpay.service.core.payment.pay.dao.PayExpiredTimeRepository; diff --git a/daxpay-single/daxpay-single-service/src/test/java/cn/bootx/platform/daxpay/core/util/PayParamSignTest.java b/daxpay-single/daxpay-single-service/src/test/java/cn/bootx/platform/daxpay/core/util/PayParamSignTest.java index b3cb08a13..d98771922 100644 --- a/daxpay-single/daxpay-single-service/src/test/java/cn/bootx/platform/daxpay/core/util/PayParamSignTest.java +++ b/daxpay-single/daxpay-single-service/src/test/java/cn/bootx/platform/daxpay/core/util/PayParamSignTest.java @@ -2,8 +2,7 @@ package cn.bootx.platform.daxpay.core.util; import cn.bootx.platform.daxpay.param.channel.AliPayParam; import cn.bootx.platform.daxpay.param.channel.WeChatPayParam; -import cn.bootx.platform.daxpay.param.pay.PayChannelParam; -import cn.bootx.platform.daxpay.param.pay.PayParam; +import cn.bootx.platform.daxpay.param.payment.pay.PayParam; import cn.bootx.platform.daxpay.util.PaySignUtil; import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j;