lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-08-25 01:14:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化重构部分支付相关代码

Browse Source
This commit is contained in:
Binary Wang 2017-01-05 12:29:26 +08:00
parent cbf78114f7
commit 55d66ac7c9
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java
View File

@ -83,7 +83,7 @@ public class WxMpPayServiceImpl implements WxMpPayService {
String url = PAY_BASE_URL + "/pay/refundquery"; String url = PAY_BASE_URL + "/pay/refundquery";
String responseContent = this.executeRequest(url, request.toXML()); String responseContent = this.executeRequest(url, request.toXML());
WxPayRefundQueryResult result = WxPayRefundQueryResult.fromXML(responseContent, WxPayRefundQueryResult.class); WxPayRefundQueryResult result = WxPayRefundQueryResult.fromXML(responseContent, WxPayRefundQueryResult.class);
result.composeRefundRecords(responseContent); result.composeRefundRecords();
this.checkResult(result); this.checkResult(result);
return result; return result;
} }
@ -189,7 +189,7 @@ public class WxMpPayServiceImpl implements WxMpPayService {
String url = PAY_BASE_URL + "/pay/orderquery"; String url = PAY_BASE_URL + "/pay/orderquery";
String responseContent = this.executeRequest(url, request.toXML()); String responseContent = this.executeRequest(url, request.toXML());
WxPayOrderQueryResult result = WxPayOrderQueryResult.fromXML(responseContent, WxPayOrderQueryResult.class); WxPayOrderQueryResult result = WxPayOrderQueryResult.fromXML(responseContent, WxPayOrderQueryResult.class);
result.composeCoupons(responseContent); result.composeCoupons();
this.checkResult(result); this.checkResult(result);
return result; return result;
} }

10
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRedpackQueryResult.java
View File

@ -52,11 +52,11 @@ public class WxPayRedpackQueryResult extends WxPayBaseResult {
* RECEIVED * RECEIVED
* string(16) * string(16)
* SENDING:发放中， * SENDING:发放中，
* SENT:已发放待领取， * SENT:已发放待领取，
* FAILED：发放失败， * FAILED：发放失败，
* RECEIVED:已领取， * RECEIVED:已领取，
* RFUND_ING:退款中， * RFUND_ING:退款中，
* REFUND:已退款 * REFUND:已退款
* </pre> * </pre>
*/ */
@XStreamAlias("status") @XStreamAlias("status")

7
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResult.java
View File

@ -184,10 +184,13 @@ public class WxPayRefundQueryResult extends WxPayBaseResult {
this.refundRecords = refundRecords; this.refundRecords = refundRecords;
} }
public void composeRefundRecords(String xmlString) { /**
* 组装生成退款记录属性的内容
*/
public void composeRefundRecords() {
if (this.refundCount != null && this.refundCount > 0) { if (this.refundCount != null && this.refundCount > 0) {
this.refundRecords = Lists.newArrayList(); this.refundRecords = Lists.newArrayList();
XmlPath xmlPath = new XmlPath(xmlString); XmlPath xmlPath = new XmlPath(this.getXmlString());
for (int i = 0; i < this.refundCount; i++) { for (int i = 0; i < this.refundCount; i++) {
RefundRecord refundRecord = new RefundRecord(); RefundRecord refundRecord = new RefundRecord();

5
weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/result/WxPayRefundQueryResultTest.java
View File

@ -33,9 +33,8 @@ public class WxPayRefundQueryResultTest {
" <transaction_id><![CDATA[1008450740201411110005820873]]></transaction_id>\n" + " <transaction_id><![CDATA[1008450740201411110005820873]]></transaction_id>\n" +
"</xml>"; "</xml>";
WxPayRefundQueryResult result = new WxPayRefundQueryResult(); WxPayRefundQueryResult result = WxPayRefundQueryResult.fromXML(xmlString, WxPayRefundQueryResult.class);
result.setRefundCount(1); result.composeRefundRecords();
result.composeRefundRecords(xmlString);
Assert.assertNotNull(result.getRefundRecords()); Assert.assertNotNull(result.getRefundRecords());
Assert.assertEquals(result.getRefundRecords().size(), 1); Assert.assertEquals(result.getRefundRecords().size(), 1);