Skip to content

修改退款接口字段错误 #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Sep 29, 2020
Merged
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1812b23
art:证书类配置读取优化调整
Aug 17, 2020
2b27ee9
new:电商收付通二级商户进件
Aug 17, 2020
a3ec261
Merge branch 'develop' into develop
binarywang Aug 18, 2020
cee3753
Merge remote-tracking branch 'wechat/develop' into develop
Aug 24, 2020
10e0ca5
art:微信服务商配置优化
Aug 24, 2020
5db9706
new:jsapi合单支付
Aug 24, 2020
e0d87eb
new:合单支付
Aug 26, 2020
84b9b99
Merge remote-tracking branch 'wechat/develop' into develop
Aug 30, 2020
541899a
Merge remote-tracking branch 'wechat/develop' into develop
Sep 4, 2020
9f60516
Merge remote-tracking branch 'wechat/develop' into develop
Sep 8, 2020
97409a7
new:电商收付通普通支付
Sep 8, 2020
f18c62b
new:电商收付通支付回调处理
Sep 10, 2020
b8d9a15
Merge remote-tracking branch 'wechat/develop' into develop
Sep 10, 2020
c8fc670
new:电商收付通支付回调处理
Sep 10, 2020
4f157b0
Merge remote-tracking branch 'wechat/develop' into develop
Sep 10, 2020
34f0d99
电商收付通支付调整
Sep 11, 2020
c2552de
Merge remote-tracking branch 'wechat/develop' into develop
Sep 11, 2020
3fbeec4
Merge remote-tracking branch 'wechat/develop' into develop
Sep 14, 2020
e56289f
Merge remote-tracking branch 'wechat/develop' into develop
Sep 15, 2020
60c63a5
fix:电商收付通回调通知测试
Sep 17, 2020
5b606fd
Merge remote-tracking branch 'wechat/develop' into develop
Sep 17, 2020
aa2fe98
Merge remote-tracking branch 'wechat/develop' into develop
Sep 20, 2020
9b20c74
new:电商收付通合单支付、普通支付查询
Sep 21, 2020
00bc965
new:电商收付通商户、平台提现
Sep 21, 2020
2037900
fix:命名统一调整
Sep 21, 2020
3b4bb74
Merge remote-tracking branch 'wechat/develop' into develop
Sep 22, 2020
58ac339
new:分账查询、退款通知
Sep 22, 2020
7df0e75
new:修改结算账户、退款查询
Sep 23, 2020
07edd5b
Merge remote-tracking branch 'wechat/develop' into develop
Sep 23, 2020
f0f21e1
Merge remote-tracking branch 'wechat/develop' into develop
Sep 25, 2020
a28a17a
Merge remote-tracking branch 'wechat/develop' into develop
Sep 27, 2020
d248c0e
fix:字段错误
Sep 28, 2020
9603199
Merge remote-tracking branch 'wechat/develop' into develop
Sep 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
*/

import com.google.gson.annotations.SerializedName;
import lombok.*;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;
Expand All @@ -20,9 +21,7 @@
* @date: 2020/09/14
*/
@Data
@Builder
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@NoArgsConstructor
public class RefundsResult implements Serializable {
private static final long serialVersionUID = -3186851559004865784L;

Expand All @@ -42,17 +41,17 @@ public class RefundsResult implements Serializable {

/**
* <pre>
* 字段名:商户订单号
* 变量名:out_order_no
* 是否必填:与transaction_id二选一
* 字段名:商户退款单号
* 变量名:out_refund_no
* 是否必填:
* 类型:string(64)
* 描述:
* 原支付交易对应的商户订单号
* 示例值:P20150806125346
* 商户系统内部的退款单号,商户系统内部唯一,同一退款单号多次请求只退一笔
* 示例值:1217752501201407033233368018
* </pre>
*/
@SerializedName(value = "out_order_no")
private String outOrderNo;
@SerializedName(value = "out_refund_no")
private String outRefundNo;

/**
* <pre>
Expand Down Expand Up @@ -95,9 +94,7 @@ public class RefundsResult implements Serializable {
private PromotionDetail[] promotionDetail;

@Data
@Builder
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@NoArgsConstructor
public static class Amount implements Serializable {

private static final long serialVersionUID = 7383027142329410399L;
Expand Down Expand Up @@ -161,9 +158,7 @@ public static class Amount implements Serializable {
}

@Data
@Builder
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@NoArgsConstructor
public static class PromotionDetail implements Serializable {

private static final long serialVersionUID = 7383027142329410399L;
Expand Down