From 8cbbe932f216cd6d79fda2a5edff9c4a814d33fa Mon Sep 17 00:00:00 2001 From: liwq <122639653@qq.com> Date: Mon, 26 May 2025 17:49:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=86=E6=9E=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0sdk=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tashow-sdk/tashow-sdk-payment/pom.xml | 4 ++ .../dto/order/PayOrderUnifiedReqDTO.java | 8 +--- .../payment/dto/refund/PayRefundRespDTO.java | 4 +- .../dto/refund/PayRefundUnifiedReqDTO.java | 2 - .../dto/transfer/PayTransferRespDTO.java | 2 +- .../transfer/PayTransferUnifiedReqDTO.java | 13 +++---- .../enums/transfer/PayTransferTypeEnum.java | 2 +- .../test/java/com/tashow/cloud/AppTest.java | 38 ------------------- 8 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 tashow-sdk/tashow-sdk-payment/src/test/java/com/tashow/cloud/AppTest.java diff --git a/tashow-sdk/tashow-sdk-payment/pom.xml b/tashow-sdk/tashow-sdk-payment/pom.xml index f8f7a71..cd24efd 100644 --- a/tashow-sdk/tashow-sdk-payment/pom.xml +++ b/tashow-sdk/tashow-sdk-payment/pom.xml @@ -36,5 +36,9 @@ jakarta.validation jakarta.validation-api + + org.hibernate.validator + hibernate-validator + diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/order/PayOrderUnifiedReqDTO.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/order/PayOrderUnifiedReqDTO.java index 9d400a6..f9aacc5 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/order/PayOrderUnifiedReqDTO.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/order/PayOrderUnifiedReqDTO.java @@ -1,12 +1,10 @@ package com.tashow.cloud.sdk.payment.dto.order; -import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum; +import com.tashow.cloud.sdk.payment.enums.order.PayOrderDisplayModeEnum; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.constraints.URL; import java.time.LocalDateTime; import java.util.Map; @@ -38,23 +36,19 @@ public class PayOrderUnifiedReqDTO { * 商品标题 */ @NotEmpty(message = "商品标题不能为空") - @Length(max = 32, message = "商品标题不能超过 32") private String subject; /** * 商品描述信息 */ - @Length(max = 128, message = "商品描述信息长度不能超过128") private String body; /** * 支付结果的 notify 回调地址 */ @NotEmpty(message = "支付结果的回调地址不能为空") - @URL(message = "支付结果的 notify 回调地址必须是 URL 格式") private String notifyUrl; /** * 支付结果的 return 回调地址 */ - @URL(message = "支付结果的 return 回调地址必须是 URL 格式") private String returnUrl; // ========== 订单相关字段 ========== diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundRespDTO.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundRespDTO.java index 5c0bb77..5294b63 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundRespDTO.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundRespDTO.java @@ -1,7 +1,7 @@ package com.tashow.cloud.sdk.payment.dto.refund; -import cn.iocoder.yudao.framework.pay.core.client.exception.PayException; -import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum; +import com.tashow.cloud.sdk.payment.enums.refund.PayRefundStatusRespEnum; +import com.tashow.cloud.sdk.payment.exception.PayException; import lombok.Data; import java.time.LocalDateTime; diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundUnifiedReqDTO.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundUnifiedReqDTO.java index 81f6699..7f0b7b5 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundUnifiedReqDTO.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/refund/PayRefundUnifiedReqDTO.java @@ -8,7 +8,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.URL; /** * 统一 退款 Request DTO @@ -63,7 +62,6 @@ public class PayRefundUnifiedReqDTO { * 退款结果的 notify 回调地址 */ @NotEmpty(message = "支付结果的回调地址不能为空") - @URL(message = "支付结果的 notify 回调地址必须是 URL 格式") private String notifyUrl; } diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferRespDTO.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferRespDTO.java index 0b65d31..6e35d14 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferRespDTO.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferRespDTO.java @@ -1,6 +1,6 @@ package com.tashow.cloud.sdk.payment.dto.transfer; -import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferStatusRespEnum; +import com.tashow.cloud.sdk.payment.enums.transfer.PayTransferStatusRespEnum; import lombok.Data; import java.time.LocalDateTime; diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferUnifiedReqDTO.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferUnifiedReqDTO.java index 31c3244..aec9e5d 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferUnifiedReqDTO.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/dto/transfer/PayTransferUnifiedReqDTO.java @@ -1,18 +1,16 @@ package com.tashow.cloud.sdk.payment.dto.transfer; -import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum; +import com.tashow.cloud.common.validation.InEnum; +import com.tashow.cloud.sdk.payment.enums.transfer.PayTransferTypeEnum; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.URL; import java.util.Map; -import static cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum.*; /** * 统一转账 Request DTO @@ -51,25 +49,24 @@ public class PayTransferUnifiedReqDTO { * 转账标题 */ @NotEmpty(message = "转账标题不能为空") - @Length(max = 128, message = "转账标题不能超过 128") private String subject; /** * 收款人姓名 */ - @NotBlank(message = "收款人姓名不能为空", groups = {Alipay.class}) + @NotBlank(message = "收款人姓名不能为空", groups = {PayTransferTypeEnum.Alipay.class}) private String userName; /** * 支付宝登录号 */ - @NotBlank(message = "支付宝登录号不能为空", groups = {Alipay.class}) + @NotBlank(message = "支付宝登录号不能为空", groups = {PayTransferTypeEnum.Alipay.class}) private String alipayLogonId; /** * 微信 openId */ - @NotBlank(message = "微信 openId 不能为空", groups = {WxPay.class}) + @NotBlank(message = "微信 openId 不能为空", groups = {PayTransferTypeEnum.WxPay.class}) private String openid; /** diff --git a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/transfer/PayTransferTypeEnum.java b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/transfer/PayTransferTypeEnum.java index 0e5513a..b0f9c3d 100644 --- a/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/transfer/PayTransferTypeEnum.java +++ b/tashow-sdk/tashow-sdk-payment/src/main/java/com/tashow/cloud/sdk/payment/enums/transfer/PayTransferTypeEnum.java @@ -1,7 +1,7 @@ package com.tashow.cloud.sdk.payment.enums.transfer; import cn.hutool.core.util.ArrayUtil; -import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import com.tashow.cloud.common.core.ArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/tashow-sdk/tashow-sdk-payment/src/test/java/com/tashow/cloud/AppTest.java b/tashow-sdk/tashow-sdk-payment/src/test/java/com/tashow/cloud/AppTest.java deleted file mode 100644 index 255defd..0000000 --- a/tashow-sdk/tashow-sdk-payment/src/test/java/com/tashow/cloud/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.tashow.cloud; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -}