binarywang#257 微信支付申请退款接口增加refund_desc属性

binarywang · binarywang · commit bb954edf5099 · 2017-09-03T00:00:58.000+08:00
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
@@ -142,17 +142,26 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
    */
   @XStreamAlias("refund_account")
   private String refundAccount;
-
-  public WxPayRefundRequest() {
-  }
+  /**
+   * <pre>
+   * &#36864;&#27454;&#21407;&#22240;
+   * refund_account
+   * &#21542;
+   * String(80)
+   * &#21830;&#21697;&#24050;&#21806;&#23436;
+   * &#33509;&#21830;&#25143;&#20256;&#20837;&#65292;&#20250;&#22312;&#19979;&#21457;&#32473;&#29992;&#25143;&#30340;&#36864;&#27454;&#28040;&#24687;&#20013;&#20307;&#29616;&#36864;&#27454;&#21407;&#22240;
+   * </pre>
+   */
+  @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 @@ private WxPayRefundRequest(Builder builder) {
     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 void setRefundAccount(String refundAccount) {
     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 static final class Builder {
     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 static final class Builder {
     private String refundFeeType;
     private String opUserId;
     private String refundAccount;
+    private String refundDesc;
 
     private Builder() {
     }
@@ -303,13 +325,13 @@ public Builder mchId(String mchId) {
       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 Builder refundAccount(String refundAccount) {
       return this;
     }
 
+    public Builder refundDesc(String refundDesc) {
+      this.refundDesc = refundDesc;
+      return this;
+    }
+
     public WxPayRefundRequest build() {
       return new WxPayRefundRequest(this);
     }
