dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-10-14 22:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref 删除终端上报功能和去除商户字段

Browse Source
This commit is contained in:
bootx
2025-05-04 10:16:33 +08:00
parent 475706254b
commit 309ccdf918
98 changed files with 104 additions and 1730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daxpay-open-sdk/src/main/java/org/dromara/daxpay/sdk/net/DaxPayConfig.java
View File

@@ -17,9 +17,6 @@ public class DaxPayConfig {
/** 服务地址 */
private String serviceUrl;
/** 商户号 */
private String mchNo;
/** 应用号 */
private String appId;

4
daxpay-open-sdk/src/main/java/org/dromara/daxpay/sdk/net/DaxPayKit.java
View File

@@ -46,10 +46,6 @@ public class DaxPayKit {
* @return DaxResult 响应类
*/
public <T> DaxResult<T> execute(DaxPayRequest<T> request, boolean sign) {
// 判断是否需要填充商户号和应用号
if (Objects.isNull(request.getMchNo())) {
request.setMchNo(config.getMchNo());
}
if (Objects.isNull(request.getAppId())) {
request.setAppId(config.getAppId());
}

6
daxpay-open-sdk/src/main/java/org/dromara/daxpay/sdk/net/DaxPayRequest.java
View File

@@ -21,12 +21,6 @@ import java.time.LocalDateTime;
@Setter
public abstract class DaxPayRequest<T> {
/** 商户号 */
@Schema(description = "商户号")
@NotBlank(message = "商户号不可为空")
@Size(max = 32, message = "商户号不可超过32位")
private String mchNo;
/** 应用号 */
@Schema(description = "应用号")
@NotBlank(message = "应用号不可为空")

4
daxpay-open-sdk/src/main/java/org/dromara/daxpay/sdk/response/DaxNoticeResult.java
View File

@@ -20,10 +20,6 @@ public class DaxNoticeResult<T> extends DaxResult<T>{
@Schema(description = "通知类型")
private String noticeType;
/** 商户号 */
@Schema(description = "商户号")
private String mchNo;
/** 应用ID */
@Schema(description = "应用ID")
private String appId;

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/notice/NoticeTest.java
View File

@@ -31,7 +31,6 @@ public class NoticeTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.HMAC_SHA256)
.mchNo("M1723635576766")
.appId("M8088873888246277")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/query/QueryPayOrderTest.java
View File

@@ -24,7 +24,6 @@ public class QueryPayOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/query/QueryRefundOrderTest.java
View File

@@ -24,7 +24,6 @@ public class QueryRefundOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/query/QueryTransferOrderTest.java
View File

@@ -25,7 +25,6 @@ public class QueryTransferOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/trade/CloseOrderTest.java
View File

@@ -24,7 +24,6 @@ public class CloseOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/trade/GatewayPayTest.java
View File

@@ -28,7 +28,6 @@ public class GatewayPayTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/trade/PayOrderTest.java
View File

@@ -31,7 +31,6 @@ public class PayOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/trade/RefundOrderTest.java
View File

@@ -29,7 +29,6 @@ public class RefundOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);

1
daxpay-open-sdk/src/test/java/org/dromara/daxpay/sdk/trade/TransferOrderTest.java
View File

@@ -29,7 +29,6 @@ public class TransferOrderTest {
.serviceUrl("http://127.0.0.1:19999")
.signSecret("123456")
.signType(SignTypeEnum.MD5)
.mchNo("M1723635576766")
.appId("M8207639754663343")
.build();
DaxPayKit.initConfig(config);