binarywang
diff --git a/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxEntPayQueryRequest.java
Lines changed: 9 additions & 28 deletions b/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxEntPayQueryRequest.java
Lines changed: 9 additions & 28 deletions
diff --git a/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxEntPayRequest.java
Lines changed: 12 additions & 12 deletions b/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxEntPayRequest.java
Lines changed: 12 additions & 12 deletions
diff --git a/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java
Lines changed: 6 additions & 5 deletions b/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java
Lines changed: 6 additions & 5 deletions
diff --git a/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayOrderQueryRequest.java
Lines changed: 2 additions & 2 deletions b/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayOrderQueryRequest.java
Lines changed: 2 additions & 2 deletions
diff --git a/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayRefundRequest.java
Lines changed: 14 additions & 13 deletions b/‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayRefundRequest.java
Lines changed: 14 additions & 13 deletions
@@ -1,10 +1,12 @@
 package me.chanjar.weixin.mp.bean.pay.request;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import me.chanjar.weixin.common.annotation.Required;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+import me.chanjar.weixin.common.annotation.Required;
+
 /**
  * <pre>
  * 企业付款请求对象
@@ -31,6 +33,7 @@ public class WxEntPayQueryRequest extends WxPayBaseRequest {
    * 微信支付分配的商户号
    * </pre>
   */
+  @SuppressWarnings("hiding")
   @XStreamAlias("mchid")
   private String mchId;
 
@@ -48,40 +51,18 @@ public class WxEntPayQueryRequest extends WxPayBaseRequest {
   @XStreamAlias("partner_trade_no")
   private String partnerTradeNo;
 
-  public String getAppid() {
-    return appid;
-  }
-
-  public void setAppid(String appid) {
-    this.appid = appid;
-  }
-
+  @Override
   public String getMchId() {
-    return mchId;
+    return this.mchId;
   }
 
+  @Override
   public void setMchId(String mchId) {
     this.mchId = mchId;
   }
 
-  public String getNonceStr() {
-    return nonceStr;
-  }
-
-  public void setNonceStr(String nonceStr) {
-    this.nonceStr = nonceStr;
-  }
-
-  public String getSign() {
-    return sign;
-  }
-
-  public void setSign(String sign) {
-    this.sign = sign;
-  }
-
   public String getPartnerTradeNo() {
-    return partnerTradeNo;
+    return this.partnerTradeNo;
   }
 
   public void setPartnerTradeNo(String partnerTradeNo) {
 
@@ -181,95 +181,95 @@ public class WxEntPayRequest {
   private String spbillCreateIp;
 
   public String getMchAppid() {
-    return mchAppid;
+    return this.mchAppid;
   }
 
   public void setMchAppid(String mchAppid) {
     this.mchAppid = mchAppid;
   }
 
   public String getMchId() {
-    return mchId;
+    return this.mchId;
   }
 
   public void setMchId(String mchId) {
     this.mchId = mchId;
   }
 
   public String getDeviceInfo() {
-    return deviceInfo;
+    return this.deviceInfo;
   }
 
   public void setDeviceInfo(String deviceInfo) {
     this.deviceInfo = deviceInfo;
   }
 
   public String getNonceStr() {
-    return nonceStr;
+    return this.nonceStr;
   }
 
   public void setNonceStr(String nonceStr) {
     this.nonceStr = nonceStr;
   }
 
   public String getSign() {
-    return sign;
+    return this.sign;
   }
 
   public void setSign(String sign) {
     this.sign = sign;
   }
 
   public String getPartnerTradeNo() {
-    return partnerTradeNo;
+    return this.partnerTradeNo;
   }
 
   public void setPartnerTradeNo(String partnerTradeNo) {
     this.partnerTradeNo = partnerTradeNo;
   }
 
   public String getOpenid() {
-    return openid;
+    return this.openid;
   }
 
   public void setOpenid(String openid) {
     this.openid = openid;
   }
 
   public String getCheckName() {
-    return checkName;
+    return this.checkName;
   }
 
   public void setCheckName(String checkName) {
     this.checkName = checkName;
   }
 
   public String getReUserName() {
-    return reUserName;
+    return this.reUserName;
   }
 
   public void setReUserName(String reUserName) {
     this.reUserName = reUserName;
   }
 
   public Integer getAmount() {
-    return amount;
+    return this.amount;
   }
 
   public void setAmount(Integer amount) {
     this.amount = amount;
   }
 
   public String getDescription() {
-    return description;
+    return this.description;
   }
 
   public void setDescription(String description) {
     this.description = description;
   }
 
   public String getSpbillCreateIp() {
-    return spbillCreateIp;
+    return this.spbillCreateIp;
   }
 
   public void setSpbillCreateIp(String spbillCreateIp) {
 
@@ -1,9 +1,10 @@
 package me.chanjar.weixin.mp.bean.pay.request;
 
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
 /**
  * <pre>
  * Created by Binary Wang on 2016-10-24.
@@ -69,31 +70,31 @@ public abstract class WxPayBaseRequest {
   protected String sign;
 
   public String getAppid() {
-    return appid;
+    return this.appid;
   }
 
   public void setAppid(String appid) {
     this.appid = appid;
   }
 
   public String getMchId() {
-    return mchId;
+    return this.mchId;
   }
 
   public void setMchId(String mchId) {
     this.mchId = mchId;
   }
 
   public String getNonceStr() {
-    return nonceStr;
+    return this.nonceStr;
   }
 
   public void setNonceStr(String nonceStr) {
     this.nonceStr = nonceStr;
   }
 
   public String getSign() {
-    return sign;
+    return this.sign;
   }
 
   public void setSign(String sign) {
 
@@ -46,15 +46,15 @@ public class WxPayOrderQueryRequest extends WxPayBaseRequest {
   private String outTradeNo;
 
   public String getTransactionId() {
-    return transactionId;
+    return this.transactionId;
   }
 
   public void setTransactionId(String transactionId) {
     this.transactionId = transactionId;
   }
 
   public String getOutTradeNo() {
-    return outTradeNo;
+    return this.outTradeNo;
   }
 
   public void setOutTradeNo(String outTradeNo) {
 
@@ -1,6 +1,7 @@
 package me.chanjar.weixin.mp.bean.pay.request;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+
 import me.chanjar.weixin.common.annotation.Required;
 
 /**
@@ -196,103 +197,103 @@ public class WxPayRefundRequest {
   private String refundAccount;
 
   public String getAppid() {
-    return appid;
+    return this.appid;
   }
 
   public void setAppid(String appid) {
     this.appid = appid;
   }
 
   public String getMchId() {
-    return mchId;
+    return this.mchId;
   }
 
   public void setMchId(String mchId) {
     this.mchId = mchId;
   }
 
   public String getDeviceInfo() {
-    return deviceInfo;
+    return this.deviceInfo;
   }
 
   public void setDeviceInfo(String deviceInfo) {
     this.deviceInfo = deviceInfo;
   }
 
   public String getNonceStr() {
-    return nonceStr;
+    return this.nonceStr;
   }
 
   public void setNonceStr(String nonceStr) {
     this.nonceStr = nonceStr;
   }
 
   public String getSign() {
-    return sign;
+    return this.sign;
   }
 
   public void setSign(String sign) {
     this.sign = sign;
   }
 
   public String getTransactionId() {
-    return transactionId;
+    return this.transactionId;
   }
 
   public void setTransactionId(String transactionId) {
     this.transactionId = transactionId;
   }
 
   public String getOutTradeNo() {
-    return outTradeNo;
+    return this.outTradeNo;
   }
 
   public void setOutTradeNo(String outTradeNo) {
     this.outTradeNo = outTradeNo;
   }
 
   public String getOutRefundNo() {
-    return outRefundNo;
+    return this.outRefundNo;
   }
 
   public void setOutRefundNo(String outRefundNo) {
     this.outRefundNo = outRefundNo;
   }
 
   public Integer getTotalFee() {
-    return totalFee;
+    return this.totalFee;
   }
 
   public void setTotalFee(Integer totalFee) {
     this.totalFee = totalFee;
   }
 
   public Integer getRefundFee() {
-    return refundFee;
+    return this.refundFee;
   }
 
   public void setRefundFee(Integer refundFee) {
     this.refundFee = refundFee;
   }
 
   public String getRefundFeeType() {
-    return refundFeeType;
+    return this.refundFeeType;
   }
 
   public void setRefundFeeType(String refundFeeType) {
     this.refundFeeType = refundFeeType;
   }
 
   public String getOpUserId() {
-    return opUserId;
+    return this.opUserId;
   }
 
   public void setOpUserId(String opUserId) {
     this.opUserId = opUserId;
   }
 
   public String getRefundAccount() {
-    return refundAccount;
+    return this.refundAccount;
   }
 
   public void setRefundAccount(String refundAccount) {
Original file line number	Diff line number	Diff line change
`@@ -181,95 +181,95 @@ public class WxEntPayRequest {`
`181`	`181`	`private String spbillCreateIp;`
`182`	`182`
`183`	`183`	`public String getMchAppid() {`
`184`		`- return mchAppid;`
	`184`	`+ return this.mchAppid;`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`public void setMchAppid(String mchAppid) {`
`188`	`188`	`this.mchAppid = mchAppid;`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public String getMchId() {`
`192`		`- return mchId;`
	`192`	`+ return this.mchId;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`public void setMchId(String mchId) {`
`196`	`196`	`this.mchId = mchId;`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`public String getDeviceInfo() {`
`200`		`- return deviceInfo;`
	`200`	`+ return this.deviceInfo;`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`public void setDeviceInfo(String deviceInfo) {`
`204`	`204`	`this.deviceInfo = deviceInfo;`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`public String getNonceStr() {`
`208`		`- return nonceStr;`
	`208`	`+ return this.nonceStr;`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`public void setNonceStr(String nonceStr) {`
`212`	`212`	`this.nonceStr = nonceStr;`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`public String getSign() {`
`216`		`- return sign;`
	`216`	`+ return this.sign;`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`public void setSign(String sign) {`
`220`	`220`	`this.sign = sign;`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public String getPartnerTradeNo() {`
`224`		`- return partnerTradeNo;`
	`224`	`+ return this.partnerTradeNo;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`public void setPartnerTradeNo(String partnerTradeNo) {`
`228`	`228`	`this.partnerTradeNo = partnerTradeNo;`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`public String getOpenid() {`
`232`		`- return openid;`
	`232`	`+ return this.openid;`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`public void setOpenid(String openid) {`
`236`	`236`	`this.openid = openid;`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`public String getCheckName() {`
`240`		`- return checkName;`
	`240`	`+ return this.checkName;`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`public void setCheckName(String checkName) {`
`244`	`244`	`this.checkName = checkName;`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`public String getReUserName() {`
`248`		`- return reUserName;`
	`248`	`+ return this.reUserName;`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`public void setReUserName(String reUserName) {`
`252`	`252`	`this.reUserName = reUserName;`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`public Integer getAmount() {`
`256`		`- return amount;`
	`256`	`+ return this.amount;`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`public void setAmount(Integer amount) {`
`260`	`260`	`this.amount = amount;`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`public String getDescription() {`
`264`		`- return description;`
	`264`	`+ return this.description;`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`public void setDescription(String description) {`
`268`	`268`	`this.description = description;`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`public String getSpbillCreateIp() {`
`272`		`- return spbillCreateIp;`
	`272`	`+ return this.spbillCreateIp;`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`public void setSpbillCreateIp(String spbillCreateIp) {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`package me.chanjar.weixin.mp.bean.pay.request;`
`2`	`2`
`3`		`-import com.thoughtworks.xstream.annotations.XStreamAlias;`
`4`	`3`	`import org.apache.commons.lang3.builder.ToStringBuilder;`
`5`	`4`	`import org.apache.commons.lang3.builder.ToStringStyle;`
`6`	`5`
	`6`	`+import com.thoughtworks.xstream.annotations.XStreamAlias;`
	`7`	`+`
`7`	`8`	`/**`
`8`	`9`	`* <pre>`
`9`	`10`	`* Created by Binary Wang on 2016-10-24.`
`@@ -69,31 +70,31 @@ public abstract class WxPayBaseRequest {`
`69`	`70`	`protected String sign;`
`70`	`71`
`71`	`72`	`public String getAppid() {`
`72`		`- return appid;`
	`73`	`+ return this.appid;`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`public void setAppid(String appid) {`
`76`	`77`	`this.appid = appid;`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`public String getMchId() {`
`80`		`- return mchId;`
	`81`	`+ return this.mchId;`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`public void setMchId(String mchId) {`
`84`	`85`	`this.mchId = mchId;`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`public String getNonceStr() {`
`88`		`- return nonceStr;`
	`89`	`+ return this.nonceStr;`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`public void setNonceStr(String nonceStr) {`
`92`	`93`	`this.nonceStr = nonceStr;`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`public String getSign() {`
`96`		`- return sign;`
	`97`	`+ return this.sign;`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`public void setSign(String sign) {`
Original file line number	Diff line number	Diff line change
`@@ -46,15 +46,15 @@ public class WxPayOrderQueryRequest extends WxPayBaseRequest {`
`46`	`46`	`private String outTradeNo;`
`47`	`47`
`48`	`48`	`public String getTransactionId() {`
`49`		`- return transactionId;`
	`49`	`+ return this.transactionId;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public void setTransactionId(String transactionId) {`
`53`	`53`	`this.transactionId = transactionId;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public String getOutTradeNo() {`
`57`		`- return outTradeNo;`
	`57`	`+ return this.outTradeNo;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public void setOutTradeNo(String outTradeNo) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package me.chanjar.weixin.mp.bean.pay.request;`
`2`	`2`
`3`	`3`	`import com.thoughtworks.xstream.annotations.XStreamAlias;`
	`4`	`+`
`4`	`5`	`import me.chanjar.weixin.common.annotation.Required;`
`5`	`6`
`6`	`7`	`/**`
`@@ -196,103 +197,103 @@ public class WxPayRefundRequest {`
`196`	`197`	`private String refundAccount;`
`197`	`198`
`198`	`199`	`public String getAppid() {`
`199`		`- return appid;`
	`200`	`+ return this.appid;`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`public void setAppid(String appid) {`
`203`	`204`	`this.appid = appid;`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`public String getMchId() {`
`207`		`- return mchId;`
	`208`	`+ return this.mchId;`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`public void setMchId(String mchId) {`
`211`	`212`	`this.mchId = mchId;`
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`public String getDeviceInfo() {`
`215`		`- return deviceInfo;`
	`216`	`+ return this.deviceInfo;`
`216`	`217`	`}`
`217`	`218`
`218`	`219`	`public void setDeviceInfo(String deviceInfo) {`
`219`	`220`	`this.deviceInfo = deviceInfo;`
`220`	`221`	`}`
`221`	`222`
`222`	`223`	`public String getNonceStr() {`
`223`		`- return nonceStr;`
	`224`	`+ return this.nonceStr;`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`public void setNonceStr(String nonceStr) {`
`227`	`228`	`this.nonceStr = nonceStr;`
`228`	`229`	`}`
`229`	`230`
`230`	`231`	`public String getSign() {`
`231`		`- return sign;`
	`232`	`+ return this.sign;`
`232`	`233`	`}`
`233`	`234`
`234`	`235`	`public void setSign(String sign) {`
`235`	`236`	`this.sign = sign;`
`236`	`237`	`}`
`237`	`238`
`238`	`239`	`public String getTransactionId() {`
`239`		`- return transactionId;`
	`240`	`+ return this.transactionId;`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`public void setTransactionId(String transactionId) {`
`243`	`244`	`this.transactionId = transactionId;`
`244`	`245`	`}`
`245`	`246`
`246`	`247`	`public String getOutTradeNo() {`
`247`		`- return outTradeNo;`
	`248`	`+ return this.outTradeNo;`
`248`	`249`	`}`
`249`	`250`
`250`	`251`	`public void setOutTradeNo(String outTradeNo) {`
`251`	`252`	`this.outTradeNo = outTradeNo;`
`252`	`253`	`}`
`253`	`254`
`254`	`255`	`public String getOutRefundNo() {`
`255`		`- return outRefundNo;`
	`256`	`+ return this.outRefundNo;`
`256`	`257`	`}`
`257`	`258`
`258`	`259`	`public void setOutRefundNo(String outRefundNo) {`
`259`	`260`	`this.outRefundNo = outRefundNo;`
`260`	`261`	`}`
`261`	`262`
`262`	`263`	`public Integer getTotalFee() {`
`263`		`- return totalFee;`
	`264`	`+ return this.totalFee;`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`public void setTotalFee(Integer totalFee) {`
`267`	`268`	`this.totalFee = totalFee;`
`268`	`269`	`}`
`269`	`270`
`270`	`271`	`public Integer getRefundFee() {`
`271`		`- return refundFee;`
	`272`	`+ return this.refundFee;`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`public void setRefundFee(Integer refundFee) {`
`275`	`276`	`this.refundFee = refundFee;`
`276`	`277`	`}`
`277`	`278`
`278`	`279`	`public String getRefundFeeType() {`
`279`		`- return refundFeeType;`
	`280`	`+ return this.refundFeeType;`
`280`	`281`	`}`
`281`	`282`
`282`	`283`	`public void setRefundFeeType(String refundFeeType) {`
`283`	`284`	`this.refundFeeType = refundFeeType;`
`284`	`285`	`}`
`285`	`286`
`286`	`287`	`public String getOpUserId() {`
`287`		`- return opUserId;`
	`288`	`+ return this.opUserId;`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`public void setOpUserId(String opUserId) {`
`291`	`292`	`this.opUserId = opUserId;`
`292`	`293`	`}`
`293`	`294`
`294`	`295`	`public String getRefundAccount() {`
`295`		`- return refundAccount;`
	`296`	`+ return this.refundAccount;`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`public void setRefundAccount(String refundAccount) {`