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

fix SDK参数和返回对象与接口不一致修改

Browse Source
This commit is contained in:
DaxPay
2024-12-10 11:09:28 +08:00
parent 181993c4d3
commit 1096906e15
5 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/pay/PaySyncModel.java
View File

@@ -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;
}

16
daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/refund/RefundSyncModel.java
View File

@@ -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;
}

29
daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/model/trade/transfer/TransferSyncModel.java Normal file
View File

@@ -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;
}

8
daxpay-single-sdk/src/main/java/org/dromara/daxpay/single/sdk/param/trade/transfer/TransferSyncParam.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.lang.TypeReference;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.daxpay.single.sdk.model.trade.refund.RefundSyncModel;
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;
@@ -17,7 +17,7 @@ import org.dromara.daxpay.single.sdk.util.JsonUtil;
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
public class TransferSyncParam extends DaxPayRequest<RefundSyncModel> {
public class TransferSyncParam extends DaxPayRequest<TransferSyncModel> {
/** 商户转账号 */
private String bizTransferNo;
@@ -37,7 +37,7 @@ public class TransferSyncParam extends DaxPayRequest<RefundSyncModel> {
* 将请求返回结果反序列化为实体类
*/
@Override
public DaxPayResult<RefundSyncModel> toModel(String json) {
return JsonUtil.toBean(json, new TypeReference<DaxPayResult<RefundSyncModel>>() {});
public DaxPayResult<TransferSyncModel> toModel(String json) {
return JsonUtil.toBean(json, new TypeReference<DaxPayResult<TransferSyncModel>>() {});
}
}

2
daxpay-single/daxpay-single-core/src/main/java/org/dromara/daxpay/core/result/trade/pay/PaySyncResult.java
View File

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
public class PaySyncResult {
/**
* 退款订单同步后的状态状态
* 订单同步后的状态状态
* @see org.dromara.daxpay.core.enums.PayStatusEnum
*/
@Schema(description = "同步状态")