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

binarywang · binarywang · commit 55d66ac7c9c4 · 2017-01-05T12:29:26.000+08:00
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
@@ -83,7 +83,7 @@ public WxPayRefundQueryResult refundQuery(String transactionId, String outTradeN
     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 WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)
     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
@@ -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:已退款
    * </pre>
    */
   @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
@@ -184,10 +184,13 @@ public void setRefundRecords(List<RefundRecord> refundRecords) {
     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
@@ -33,9 +33,8 @@ public void composeRefundRecords() throws Exception {
       "   <transaction_id><![CDATA[1008450740201411110005820873]]></transaction_id>\n" +
       "</xml>";
 
-    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);
