From 0de1c7245b314d4ea524ffd67e9955a98031e2ce Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 27 Jun 2017 18:22:35 +0800 Subject: [PATCH] =?UTF-8?q?#257=20=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0refund=5Fdesc=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/request/WxPayRefundRequest.java | 63 +++++++++++++------ 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java index 59111da5..7fae6fa0 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java @@ -142,17 +142,26 @@ public class WxPayRefundRequest extends WxPayBaseRequest { */ @XStreamAlias("refund_account") private String refundAccount; - - public WxPayRefundRequest() { - } + /** + *
+   * 退款原因
+   * refund_account
+   * 否
+   * String(80)
+   * 商品已售完
+   * 若商户传入,会在下发给用户的退款消息中体现退款原因
+   * 
+ */ + @XStreamAlias("refund_desc") + private String refundDesc; private WxPayRefundRequest(Builder builder) { setDeviceInfo(builder.deviceInfo); setAppid(builder.appid); setTransactionId(builder.transactionId); setMchId(builder.mchId); - setOutTradeNo(builder.outTradeNo); setSubAppId(builder.subAppId); + setOutTradeNo(builder.outTradeNo); setSubMchId(builder.subMchId); setOutRefundNo(builder.outRefundNo); setNonceStr(builder.nonceStr); @@ -162,21 +171,13 @@ public class WxPayRefundRequest extends WxPayBaseRequest { setRefundFeeType(builder.refundFeeType); setOpUserId(builder.opUserId); setRefundAccount(builder.refundAccount); + setRefundDesc(builder.refundDesc); } public static Builder newBuilder() { return new Builder(); } - @Override - public void checkAndSign(WxPayConfig config) throws WxPayException { - if (StringUtils.isBlank(this.getOpUserId())) { - this.setOpUserId(config.getMchId()); - } - - super.checkAndSign(config); - } - public String getDeviceInfo() { return this.deviceInfo; } @@ -249,6 +250,26 @@ public class WxPayRefundRequest extends WxPayBaseRequest { this.refundAccount = refundAccount; } + public String getRefundDesc() { + return this.refundDesc; + } + + public void setRefundDesc(String refundDesc) { + this.refundDesc = refundDesc; + } + + public WxPayRefundRequest() { + } + + @Override + public void checkAndSign(WxPayConfig config) throws WxPayException { + if (StringUtils.isBlank(this.getOpUserId())) { + this.setOpUserId(config.getMchId()); + } + + super.checkAndSign(config); + } + @Override protected void checkConstraints() { if (StringUtils.isNotBlank(this.getRefundAccount())) { @@ -268,8 +289,8 @@ public class WxPayRefundRequest extends WxPayBaseRequest { private String appid; private String transactionId; private String mchId; - private String outTradeNo; private String subAppId; + private String outTradeNo; private String subMchId; private String outRefundNo; private String nonceStr; @@ -279,6 +300,7 @@ public class WxPayRefundRequest extends WxPayBaseRequest { private String refundFeeType; private String opUserId; private String refundAccount; + private String refundDesc; private Builder() { } @@ -303,13 +325,13 @@ public class WxPayRefundRequest extends WxPayBaseRequest { return this; } - public Builder outTradeNo(String outTradeNo) { - this.outTradeNo = outTradeNo; + public Builder subAppId(String subAppId) { + this.subAppId = subAppId; return this; } - public Builder subAppId(String subAppId) { - this.subAppId = subAppId; + public Builder outTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; return this; } @@ -358,6 +380,11 @@ public class WxPayRefundRequest extends WxPayBaseRequest { return this; } + public Builder refundDesc(String refundDesc) { + this.refundDesc = refundDesc; + return this; + } + public WxPayRefundRequest build() { return new WxPayRefundRequest(this); }