From 2a0558624bf96bd118292e2ae48cd1e2c2bdce69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E5=91=80?= Date: Thu, 5 Dec 2024 01:12:25 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BE=A4=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 喵呀 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 86c3c3c5..fe0a8b81 100644 --- a/README.md +++ b/README.md @@ -170,9 +170,9 @@ public class PayOrderTest { 扫码加入QQ交流群 -交流二群: 598644350 +交流三群: 879409917

- +

扫码加入钉钉交流群: [加群连接](https://qr.dingtalk.com/action/joingroup?code=v1,k1,AzkcWLa8J/OHXi+nTWwNRc68IAJ0ckWXEEIvrJofq2A=&_dt_no_comment=1&origin=11) From ff67d4c647c9f55df11aba2d2205932f987d7281 Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 8 Dec 2024 10:26:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- daxpay-single-sdk/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daxpay-single-sdk/pom.xml b/daxpay-single-sdk/pom.xml index 4f3d96f6..cda82133 100644 --- a/daxpay-single-sdk/pom.xml +++ b/daxpay-single-sdk/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.dromara.daxpay daxpay-single-sdk - 3.0.0.beta2 + 3.0.0.beta1 jar From 6687ef27cafe339326a0263e1502cf1f03578fc5 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Tue, 10 Dec 2024 11:09:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20SDK=E5=8F=82=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=B1=A1=E4=B8=8E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/model/trade/pay/PaySyncModel.java | 13 ++++++--- .../model/trade/refund/RefundSyncModel.java | 16 +++++++--- .../trade/transfer/TransferSyncModel.java | 29 +++++++++++++++++++ .../trade/transfer/TransferSyncParam.java | 20 +++++++------ .../core/result/trade/pay/PaySyncResult.java | 2 +- 5 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/transfer/TransferSyncModel.java diff --git a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/pay/PaySyncModel.java b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/pay/PaySyncModel.java index 183f4ed6..f99abccd 100644 --- a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/pay/PaySyncModel.java +++ b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/pay/PaySyncModel.java @@ -1,7 +1,7 @@ package org.dromara.daxpay.single.sdk.model.trade.pay; -import org.dromara.daxpay.single.sdk.code.PaySyncStatusEnum; import lombok.Data; +import org.dromara.daxpay.single.sdk.code.PayStatusEnum; /** * 交易同步结果 @@ -12,9 +12,14 @@ import lombok.Data; public class PaySyncModel{ /** - * 同步结果 - * @see PaySyncStatusEnum + * 退款订单同步后的状态状态 + * @see PayStatusEnum */ - private String status; + private String orderStatus; + + /** + * 是否触发了调整 + */ + private boolean adjust; } diff --git a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/refund/RefundSyncModel.java b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/refund/RefundSyncModel.java index fd282eb1..586c1c96 100644 --- a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/refund/RefundSyncModel.java +++ b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/refund/RefundSyncModel.java @@ -1,7 +1,8 @@ package org.dromara.daxpay.single.sdk.model.trade.refund; -import org.dromara.daxpay.single.sdk.code.RefundSyncStatusEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.dromara.daxpay.single.sdk.code.RefundStatusEnum; /** * 交易同步结果 @@ -12,9 +13,16 @@ import lombok.Data; public class RefundSyncModel{ /** - * 同步结果 - * @see RefundSyncStatusEnum + * 退款订单同步后的状态状态 + * @see RefundStatusEnum */ - private String status; + @Schema(description = "同步状态") + private String orderStatus; + + /** + * 是否触发了调整 + */ + @Schema(description = "是否触发了调整") + private boolean adjust; } diff --git a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/transfer/TransferSyncModel.java b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/transfer/TransferSyncModel.java new file mode 100644 index 00000000..0ce7ad22 --- /dev/null +++ b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/transfer/TransferSyncModel.java @@ -0,0 +1,29 @@ + +package org.dromara.daxpay.single.sdk.model.trade.transfer; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.daxpay.single.sdk.code.RefundStatusEnum; + +/** + * 交易同步结果 + * @author xxm + * @since 2023/12/27 + */ +@Data +public class TransferSyncModel { + + /** + * 转账订单同步后的状态状态 + * @see RefundStatusEnum + */ + @Schema(description = "同步状态") + private String orderStatus; + + /** + * 是否触发了调整 + */ + @Schema(description = "是否触发了调整") + private boolean adjust; + +} diff --git a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/param/trade/transfer/TransferSyncParam.java b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/param/trade/transfer/TransferSyncParam.java index 2be454ae..f4937a22 100644 --- a/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/param/trade/transfer/TransferSyncParam.java +++ b/daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/param/trade/transfer/TransferSyncParam.java @@ -1,21 +1,23 @@ package org.dromara.daxpay.single.sdk.param.trade.transfer; -import org.dromara.daxpay.single.sdk.model.trade.refund.RefundSyncModel; +import cn.hutool.core.lang.TypeReference; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.dromara.daxpay.single.sdk.model.trade.transfer.TransferSyncModel; import org.dromara.daxpay.single.sdk.net.DaxPayRequest; import org.dromara.daxpay.single.sdk.response.DaxPayResult; import org.dromara.daxpay.single.sdk.util.JsonUtil; -import cn.hutool.core.lang.TypeReference; -import lombok.Getter; -import lombok.Setter; /** * 转账订单同步参数 * @author xxm * @since 2024/2/7 */ -@Getter -@Setter -public class TransferSyncParam extends DaxPayRequest { +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +public class TransferSyncParam extends DaxPayRequest { /** 商户转账号 */ private String bizTransferNo; @@ -35,7 +37,7 @@ public class TransferSyncParam extends DaxPayRequest { * 将请求返回结果反序列化为实体类 */ @Override - public DaxPayResult toModel(String json) { - return JsonUtil.toBean(json, new TypeReference>() {}); + public DaxPayResult toModel(String json) { + return JsonUtil.toBean(json, new TypeReference>() {}); } } diff --git a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/trade/pay/PaySyncResult.java b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/trade/pay/PaySyncResult.java index 623467a2..268e271e 100644 --- a/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/trade/pay/PaySyncResult.java +++ b/daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/trade/pay/PaySyncResult.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; public class PaySyncResult { /** - * 退款订单同步后的状态状态 + * 订单同步后的状态状态 * @see org.dromara.daxpay.core.enums.PayStatusEnum */ @Schema(description = "同步状态")