mirror of
https://gitee.com/dromara/dax-pay.git
synced 2025-10-15 14:20:26 +00:00
fix SDK参数和返回对象与接口不一致修改
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
package org.dromara.daxpay.single.sdk.model.trade.pay;
|
package org.dromara.daxpay.single.sdk.model.trade.pay;
|
||||||
|
|
||||||
import org.dromara.daxpay.single.sdk.code.PaySyncStatusEnum;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.dromara.daxpay.single.sdk.code.PayStatusEnum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 交易同步结果
|
* 交易同步结果
|
||||||
@@ -12,9 +12,14 @@ import lombok.Data;
|
|||||||
public class PaySyncModel{
|
public class PaySyncModel{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 同步结果
|
* 退款订单同步后的状态状态
|
||||||
* @see PaySyncStatusEnum
|
* @see PayStatusEnum
|
||||||
*/
|
*/
|
||||||
private String status;
|
private String orderStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否触发了调整
|
||||||
|
*/
|
||||||
|
private boolean adjust;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
package org.dromara.daxpay.single.sdk.model.trade.refund;
|
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 lombok.Data;
|
||||||
|
import org.dromara.daxpay.single.sdk.code.RefundStatusEnum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 交易同步结果
|
* 交易同步结果
|
||||||
@@ -12,9 +13,16 @@ import lombok.Data;
|
|||||||
public class RefundSyncModel{
|
public class RefundSyncModel{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 同步结果
|
* 退款订单同步后的状态状态
|
||||||
* @see RefundSyncStatusEnum
|
* @see RefundStatusEnum
|
||||||
*/
|
*/
|
||||||
private String status;
|
@Schema(description = "同步状态")
|
||||||
|
private String orderStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否触发了调整
|
||||||
|
*/
|
||||||
|
@Schema(description = "是否触发了调整")
|
||||||
|
private boolean adjust;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -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;
|
||||||
|
|
||||||
|
}
|
@@ -4,7 +4,7 @@ import cn.hutool.core.lang.TypeReference;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.experimental.Accessors;
|
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.net.DaxPayRequest;
|
||||||
import org.dromara.daxpay.single.sdk.response.DaxPayResult;
|
import org.dromara.daxpay.single.sdk.response.DaxPayResult;
|
||||||
import org.dromara.daxpay.single.sdk.util.JsonUtil;
|
import org.dromara.daxpay.single.sdk.util.JsonUtil;
|
||||||
@@ -17,7 +17,7 @@ import org.dromara.daxpay.single.sdk.util.JsonUtil;
|
|||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@Data
|
@Data
|
||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
public class TransferSyncParam extends DaxPayRequest<RefundSyncModel> {
|
public class TransferSyncParam extends DaxPayRequest<TransferSyncModel> {
|
||||||
|
|
||||||
/** 商户转账号 */
|
/** 商户转账号 */
|
||||||
private String bizTransferNo;
|
private String bizTransferNo;
|
||||||
@@ -37,7 +37,7 @@ public class TransferSyncParam extends DaxPayRequest<RefundSyncModel> {
|
|||||||
* 将请求返回结果反序列化为实体类
|
* 将请求返回结果反序列化为实体类
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public DaxPayResult<RefundSyncModel> toModel(String json) {
|
public DaxPayResult<TransferSyncModel> toModel(String json) {
|
||||||
return JsonUtil.toBean(json, new TypeReference<DaxPayResult<RefundSyncModel>>() {});
|
return JsonUtil.toBean(json, new TypeReference<DaxPayResult<TransferSyncModel>>() {});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
|
|||||||
public class PaySyncResult {
|
public class PaySyncResult {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 退款订单同步后的状态状态
|
* 订单同步后的状态状态
|
||||||
* @see org.dromara.daxpay.core.enums.PayStatusEnum
|
* @see org.dromara.daxpay.core.enums.PayStatusEnum
|
||||||
*/
|
*/
|
||||||
@Schema(description = "同步状态")
|
@Schema(description = "同步状态")
|
||||||
|
Reference in New Issue
Block a user