From 55d66ac7c9c40dd8acbdff423e3ee4ba2517c97d Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 5 Jan 2017 12:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8D=E6=9E=84=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java | 4 ++-- .../mp/bean/pay/result/WxPayRedpackQueryResult.java | 10 +++++----- .../mp/bean/pay/result/WxPayRefundQueryResult.java | 7 +++++-- .../mp/bean/pay/result/WxPayRefundQueryResultTest.java | 5 ++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index 6ab639f1..8103993c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -83,7 +83,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { String url = PAY_BASE_URL + "/pay/refundquery"; String responseContent = this.executeRequest(url, request.toXML()); WxPayRefundQueryResult result = WxPayRefundQueryResult.fromXML(responseContent, WxPayRefundQueryResult.class); - result.composeRefundRecords(responseContent); + result.composeRefundRecords(); this.checkResult(result); return result; } @@ -189,7 +189,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { String url = PAY_BASE_URL + "/pay/orderquery"; String responseContent = this.executeRequest(url, request.toXML()); WxPayOrderQueryResult result = WxPayOrderQueryResult.fromXML(responseContent, WxPayOrderQueryResult.class); - result.composeCoupons(responseContent); + result.composeCoupons(); this.checkResult(result); return result; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRedpackQueryResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRedpackQueryResult.java index 8a2e37fa..6febaa37 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRedpackQueryResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRedpackQueryResult.java @@ -52,11 +52,11 @@ public class WxPayRedpackQueryResult extends WxPayBaseResult { * RECEIVED * string(16) * SENDING:发放中, - * SENT:已发放待领取, - * FAILED:发放失败, - * RECEIVED:已领取, - * RFUND_ING:退款中, - * REFUND:已退款 + * SENT:已发放待领取, + * FAILED:发放失败, + * RECEIVED:已领取, + * RFUND_ING:退款中, + * REFUND:已退款 * */ @XStreamAlias("status") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResult.java index 146c35df..a75946a3 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResult.java @@ -184,10 +184,13 @@ public class WxPayRefundQueryResult extends WxPayBaseResult { this.refundRecords = refundRecords; } - public void composeRefundRecords(String xmlString) { + /** + * 组装生成退款记录属性的内容 + */ + public void composeRefundRecords() { if (this.refundCount != null && this.refundCount > 0) { this.refundRecords = Lists.newArrayList(); - XmlPath xmlPath = new XmlPath(xmlString); + XmlPath xmlPath = new XmlPath(this.getXmlString()); for (int i = 0; i < this.refundCount; i++) { RefundRecord refundRecord = new RefundRecord(); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResultTest.java index 9427bd01..34672417 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResultTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResultTest.java @@ -33,9 +33,8 @@ public class WxPayRefundQueryResultTest { " \n" + ""; - WxPayRefundQueryResult result = new WxPayRefundQueryResult(); - result.setRefundCount(1); - result.composeRefundRecords(xmlString); + WxPayRefundQueryResult result = WxPayRefundQueryResult.fromXML(xmlString, WxPayRefundQueryResult.class); + result.composeRefundRecords(); Assert.assertNotNull(result.getRefundRecords()); Assert.assertEquals(result.getRefundRecords().size(), 1);