🐛 #2538 【微信支付】签约通知结果类修复request_serial字段类型

request_serial int 类型改为long
binarywang · Feb 23, 2022 · aae9beb · aae9beb
1 parent fcfee0a
commit aae9beb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java
@@ -230,6 +230,15 @@ protected static Integer readXmlInteger(Document d, String tagName) {
     return Integer.parseInt(content);
   }
 
+  protected static Long readXmlLong(Document d, String tagName) {
+    String content = readXmlString(d, tagName);
+    if (content == null || content.trim().length() == 0) {
+      return null;
+    }
+
+    return Long.parseLong(content);
+  }
+
   /**
    * Gets logger.
    *

diff --git a/...in-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayEntrustResult.java b/...in-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayEntrustResult.java
@@ -81,7 +81,7 @@ public class WxPayEntrustResult extends BaseWxPayResult implements Serializable
    * 非必传
    */
   @XStreamAlias("request_serial")
-  private Integer requestSerial;
+  private Long requestSerial;
 
   /**
    * 签约协议号
@@ -120,7 +120,7 @@ protected void loadXml(Document d) {
     tradeType = readXmlString(d, "trade_type");
     codeUrl = readXmlString(d, "code_url");
     planId = readXmlInteger(d, "plan_id");
-    requestSerial = readXmlInteger(d, "request_serial");
+    requestSerial = readXmlLong(d, "request_serial");
     contractCode = readXmlString(d, "contract_code");
     contractDisplayAccount = readXmlString(d, "contract_display_account");
     mwebUrl = readXmlString(d, "mweb_url");

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignQueryResult.java
@@ -42,7 +42,7 @@ public class WxSignQueryResult extends BaseWxPayResult implements Serializable {
    * 请求序列号
    */
   @XStreamAlias("request_serial")
-  private Integer requestSerial;
+  private Long requestSerial;
 
   /**
    * 签约协议号
@@ -106,7 +106,7 @@ public class WxSignQueryResult extends BaseWxPayResult implements Serializable {
   protected void loadXml(Document d) {
     contractId = readXmlString(d, "contract_id");
     planId = readXmlString(d, "plan_id");
-    requestSerial = readXmlInteger(d, "request_serial");
+    requestSerial = readXmlLong(d, "request_serial");
     contractCode = readXmlString(d, "contract_code");
     contractDisplayAccount = readXmlString(d, "contract_display_account");
     contractState = readXmlInteger(d, "contract_state");

diff --git a/...a-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignStatusNotifyResult.java b/...a-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxSignStatusNotifyResult.java
@@ -81,7 +81,7 @@ public class WxSignStatusNotifyResult extends BaseWxPayResult {
    * 请求序列号
    */
   @XStreamAlias("request_serial")
-  private Integer requestSerial;
+  private Long requestSerial;
 
   @Override
   public void checkResult(WxPayService wxPayService, String signType, boolean checkSuccess) throws WxPayException {
@@ -117,7 +117,7 @@ protected void loadXml(Document d) {
     contractId = readXmlString(d, "contract_id");
     contractExpiredTime = readXmlString(d, "contract_expired_time");
     contractTerminationMode = readXmlInteger(d, "contract_termination_mode");
-    requestSerial = readXmlInteger(d, "request_serial");
+    requestSerial = readXmlLong(d, "request_serial");
   }
 
   @Override