🎨 #1472 补充微信支付模块部分Result类在XML快速模式转换下缺失的字段

binarywang · Mar 26, 2020 · 60c37d8 · 60c37d8
1 parent 0397e44
commit 60c37d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/...java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java b/...java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
@@ -1,17 +1,13 @@
 package com.github.binarywang.wxpay.bean.result;
 
-import java.io.Serializable;
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <pre>
  *  查询订单 返回结果对象
@@ -360,6 +356,11 @@ protected void loadXML(Document d) {
     cashFeeType = readXMLString(d, "cash_fee_type");
     couponFee = readXMLInteger(d, "coupon_fee");
     couponCount = readXMLInteger(d, "coupon_count");
+    this.transactionId = readXMLString(d, "transaction_id");
+    this.outTradeNo = readXMLString(d, "out_trade_no");
+    this.attach = readXMLString(d, "attach");
+    this.timeEnd = readXMLString(d, "time_end");
+    this.tradeStateDesc = readXMLString(d, "trade_state_desc");
   }
 
   /**

diff --git a/...va-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java b/...va-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
@@ -1,9 +1,5 @@
 package com.github.binarywang.wxpay.bean.result;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,6 +8,10 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <pre>
  * Created by Binary Wang on 2016-11-28.
@@ -241,6 +241,7 @@ protected void loadXML(Document d) {
     hbType = readXMLString(d, "hb_type");
     totalNum = readXMLInteger(d, "total_num");
     totalAmount = readXMLInteger(d, "total_amount");
+    reason = readXMLString(d, "reason");
     sendTime = readXMLString(d, "send_time");
     refundTime = readXMLString(d, "refund_time");
     refundAmount = readXMLInteger(d, "refund_amount");