From 2406dc63ac163640483bec956bc0bc2f14d70c78 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 12 Mar 2020 17:51:00 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1435=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E7=B1=BB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=87=A0=E4=B8=AA=E7=BC=BA=E5=A4=B1=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayOrderQueryResult.java    | 76 +++++++++++++++----
 1 file changed, 62 insertions(+), 14 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 906a8cf12..73b5fabbc 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
@@ -77,7 +77,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    * <pre>
    * 是否关注公众账号.
    * is_subscribe
-   * 否
+   * 是
    * String(1)
    * Y
    * 用户是否关注公众账号，Y-关注，N-未关注，仅在公众账号类型支付有效
@@ -86,6 +86,32 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("is_subscribe")
   private String isSubscribe;
 
+  /**
+   * <pre>
+   * 用户子标识	.
+   * sub_openid
+   * 否
+   * String(128)
+   * oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+   * 用户在子商户appid下的唯一标识
+   * </pre>
+   */
+  @XStreamAlias("sub_openid")
+  private String subOpenid;
+
+  /**
+   * <pre>
+   * 是否关注子公众账号.
+   * sub_is_subscribe
+   * 否
+   * String(1)
+   * Y
+   * 用户是否关注子公众账号，Y-关注，N-未关注（机构商户不返回）
+   * </pre>
+   */
+  @XStreamAlias("sub_is_subscribe")
+  private String isSubscribeSub;
+
   /**
    * <pre>
    * 交易类型.
@@ -125,6 +151,25 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("bank_type")
   private String bankType;
 
+  /**
+   * <pre>
+   * 商品详情.
+   * detail
+   * 否
+   * String(8192)
+   * 商品详细列表，使用Json格式，传输签名前请务必使用CDATA标签将JSON文本串保护起来。如果使用了单品优惠，会有单品优惠信息返回
+   *
+   * discount_detail []：
+   * └ goods_id String 必填 32 商品的编号
+   * └ goods_name String 必填 256 商品名称
+   * └ coupon_batch_id String 必填 代金券批次ID
+   * └ coupon_id String 必填 代金卷ID
+   * └ coupon_fee Int 必填 代金券支付金额，单位为分
+   * </pre>
+   **/
+  @XStreamAlias("detail")
+  private String detail;
+
   /**
    * <pre>
    * 订单金额.
@@ -138,19 +183,6 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("total_fee")
   private Integer totalFee;
 
-  /**
-   * <pre>
-   * 应结订单金额.
-   * settlement_total_fee
-   * 否
-   * Int
-   * 100
-   * 应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
-   * </pre>
-   */
-  @XStreamAlias("settlement_total_fee")
-  private Integer settlementTotalFee;
-
   /**
    * <pre>
    * 货币种类.
@@ -164,6 +196,19 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("fee_type")
   private String feeType;
 
+  /**
+   * <pre>
+   * 应结订单金额.
+   * settlement_total_fee
+   * 否
+   * Int
+   * 100
+   * 应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
+   * </pre>
+   */
+  @XStreamAlias("settlement_total_fee")
+  private Integer settlementTotalFee;
+
   /**
    * <pre>
    * 现金支付金额.
@@ -240,6 +285,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    */
   @XStreamAlias("out_trade_no")
   private String outTradeNo;
+
   /**
    * <pre>
    * 附加数据.
@@ -252,6 +298,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    */
   @XStreamAlias("attach")
   private String attach;
+
   /**
    * <pre>
    * 支付完成时间.
@@ -264,6 +311,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    */
   @XStreamAlias("time_end")
   private String timeEnd;
+
   /**
    * <pre>
    * 交易状态描述.