Merge remote-tracking branch 'wechat/develop' into develop

# Conflicts: # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
binarywang · binarywang · Sep 22, 2020 · Aug 17, 2020 · Aug 17, 2020 · Aug 18, 2020
commit 4f157b08eaad70ff9db14b70b41c4e48dfaa0681
diff --git a/...main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java b/...main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
@@ -17,6 +17,7 @@
 @NoArgsConstructor
 public class CombineTransactionsNotifyResult implements Serializable {
 
+  private static final long serialVersionUID = -4710926828683593250L;
   /**
    * 源数据
    */

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java
@@ -12,7 +12,7 @@
 @Data
 @NoArgsConstructor
 public class NotifyResponse implements Serializable {
-
+  private static final long serialVersionUID = 341873114458149365L;
   @SerializedName(value = "id")
   private String id;
 

diff --git a/...main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java b/...main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
@@ -16,7 +16,7 @@
 @Data
 @NoArgsConstructor
 public class PartnerTransactionsNotifyResult implements Serializable {
-
+  private static final long serialVersionUID = -6602962275015706689L;
   /**
    * 源数据
    */

diff --git a/...in-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java b/...in-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
@@ -12,7 +12,7 @@
 @Data
 @NoArgsConstructor
 public class SignatureHeader implements Serializable {
-
+  private static final long serialVersionUID = -6958015499416059949L;
   /**
    * 时间戳
    */

diff --git a/...ava-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java b/...ava-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
@@ -9,12 +9,22 @@
 @Getter
 @AllArgsConstructor
 public enum TradeTypeEnum {
-
-  APP("/v3/combine-transactions/app","/v3/pay/partner/transactions/app"),
-  JSAPI("/v3/combine-transactions/jsapi","/v3/pay/partner/transactions/jsapi"),
-  NATIVE("/v3/combine-transactions/native","/v3/pay/partner/transactions/native"),
-  MWEB("/v3/combine-transactions/h5","/v3/pay/partner/transactions/h5")
-  ;
+  /**
+   * APP
+   */
+  APP("/v3/combine-transactions/app", "/v3/pay/partner/transactions/app"),
+  /**
+   * JSAPI
+   */
+  JSAPI("/v3/combine-transactions/jsapi", "/v3/pay/partner/transactions/jsapi"),
+  /**
+   * NATIVE
+   */
+  NATIVE("/v3/combine-transactions/native", "/v3/pay/partner/transactions/native"),
+  /**
+   * MWEB
+   */
+  MWEB("/v3/combine-transactions/h5", "/v3/pay/partner/transactions/h5");
 
   /**
    * 合单url