Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions ...java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
* 查询订单 返回结果对象
Expand Down Expand Up @@ -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");
}

/**
Expand Down
9 changes: 5 additions & 4 deletions ...va-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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");
Expand Down