From 60c37d83da145c926a1317ac4e1529f1ae6c7333 Mon Sep 17 00:00:00 2001
From: 1ibo <422423229@qq.com>
Date: Thu, 26 Mar 2020 23:05:39 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1472=20=E8=A1=A5=E5=85=85=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9D=97=E9=83=A8=E5=88=86?=
 =?UTF-8?q?Result=E7=B1=BB=E5=9C=A8XML=E5=BF=AB=E9=80=9F=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=8B=E7=BC=BA=E5=A4=B1=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayOrderQueryResult.java      | 17 +++++++++--------
 .../bean/result/WxPayRedpackQueryResult.java    |  9 +++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
index 73b5fabbc..2737dc2a6 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
+++ b/weixin-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 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
     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/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
index 91c6eb7f2..669e01f7f 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
+++ b/weixin-java-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.Document;
 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 @@ public class WxPayRedpackQueryResult extends BaseWxPayResult {
     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");