调整框架,删除不必要的组件,添加sdk模块
This commit is contained in:
@@ -36,5 +36,9 @@
|
|||||||
<groupId>jakarta.validation</groupId>
|
<groupId>jakarta.validation</groupId>
|
||||||
<artifactId>jakarta.validation-api</artifactId>
|
<artifactId>jakarta.validation-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.hibernate.validator</groupId>
|
||||||
|
<artifactId>hibernate-validator</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
package com.tashow.cloud.sdk.payment.dto.order;
|
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.DecimalMin;
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.hibernate.validator.constraints.Length;
|
|
||||||
import org.hibernate.validator.constraints.URL;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -38,23 +36,19 @@ public class PayOrderUnifiedReqDTO {
|
|||||||
* 商品标题
|
* 商品标题
|
||||||
*/
|
*/
|
||||||
@NotEmpty(message = "商品标题不能为空")
|
@NotEmpty(message = "商品标题不能为空")
|
||||||
@Length(max = 32, message = "商品标题不能超过 32")
|
|
||||||
private String subject;
|
private String subject;
|
||||||
/**
|
/**
|
||||||
* 商品描述信息
|
* 商品描述信息
|
||||||
*/
|
*/
|
||||||
@Length(max = 128, message = "商品描述信息长度不能超过128")
|
|
||||||
private String body;
|
private String body;
|
||||||
/**
|
/**
|
||||||
* 支付结果的 notify 回调地址
|
* 支付结果的 notify 回调地址
|
||||||
*/
|
*/
|
||||||
@NotEmpty(message = "支付结果的回调地址不能为空")
|
@NotEmpty(message = "支付结果的回调地址不能为空")
|
||||||
@URL(message = "支付结果的 notify 回调地址必须是 URL 格式")
|
|
||||||
private String notifyUrl;
|
private String notifyUrl;
|
||||||
/**
|
/**
|
||||||
* 支付结果的 return 回调地址
|
* 支付结果的 return 回调地址
|
||||||
*/
|
*/
|
||||||
@URL(message = "支付结果的 return 回调地址必须是 URL 格式")
|
|
||||||
private String returnUrl;
|
private String returnUrl;
|
||||||
|
|
||||||
// ========== 订单相关字段 ==========
|
// ========== 订单相关字段 ==========
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.tashow.cloud.sdk.payment.dto.refund;
|
package com.tashow.cloud.sdk.payment.dto.refund;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
|
import com.tashow.cloud.sdk.payment.enums.refund.PayRefundStatusRespEnum;
|
||||||
import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
|
import com.tashow.cloud.sdk.payment.exception.PayException;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import lombok.Builder;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
import org.hibernate.validator.constraints.URL;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统一 退款 Request DTO
|
* 统一 退款 Request DTO
|
||||||
@@ -63,7 +62,6 @@ public class PayRefundUnifiedReqDTO {
|
|||||||
* 退款结果的 notify 回调地址
|
* 退款结果的 notify 回调地址
|
||||||
*/
|
*/
|
||||||
@NotEmpty(message = "支付结果的回调地址不能为空")
|
@NotEmpty(message = "支付结果的回调地址不能为空")
|
||||||
@URL(message = "支付结果的 notify 回调地址必须是 URL 格式")
|
|
||||||
private String notifyUrl;
|
private String notifyUrl;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.tashow.cloud.sdk.payment.dto.transfer;
|
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 lombok.Data;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|||||||
@@ -1,18 +1,16 @@
|
|||||||
package com.tashow.cloud.sdk.payment.dto.transfer;
|
package com.tashow.cloud.sdk.payment.dto.transfer;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.validation.InEnum;
|
import com.tashow.cloud.common.validation.InEnum;
|
||||||
import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum;
|
import com.tashow.cloud.sdk.payment.enums.transfer.PayTransferTypeEnum;
|
||||||
import jakarta.validation.constraints.Min;
|
import jakarta.validation.constraints.Min;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.hibernate.validator.constraints.Length;
|
|
||||||
import org.hibernate.validator.constraints.URL;
|
import org.hibernate.validator.constraints.URL;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum.*;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统一转账 Request DTO
|
* 统一转账 Request DTO
|
||||||
@@ -51,25 +49,24 @@ public class PayTransferUnifiedReqDTO {
|
|||||||
* 转账标题
|
* 转账标题
|
||||||
*/
|
*/
|
||||||
@NotEmpty(message = "转账标题不能为空")
|
@NotEmpty(message = "转账标题不能为空")
|
||||||
@Length(max = 128, message = "转账标题不能超过 128")
|
|
||||||
private String subject;
|
private String subject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 收款人姓名
|
* 收款人姓名
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "收款人姓名不能为空", groups = {Alipay.class})
|
@NotBlank(message = "收款人姓名不能为空", groups = {PayTransferTypeEnum.Alipay.class})
|
||||||
private String userName;
|
private String userName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付宝登录号
|
* 支付宝登录号
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "支付宝登录号不能为空", groups = {Alipay.class})
|
@NotBlank(message = "支付宝登录号不能为空", groups = {PayTransferTypeEnum.Alipay.class})
|
||||||
private String alipayLogonId;
|
private String alipayLogonId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 微信 openId
|
* 微信 openId
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "微信 openId 不能为空", groups = {WxPay.class})
|
@NotBlank(message = "微信 openId 不能为空", groups = {PayTransferTypeEnum.WxPay.class})
|
||||||
private String openid;
|
private String openid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.tashow.cloud.sdk.payment.enums.transfer;
|
package com.tashow.cloud.sdk.payment.enums.transfer;
|
||||||
|
|
||||||
import cn.hutool.core.util.ArrayUtil;
|
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.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
|
|||||||
@@ -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 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user