调整参数位置

binarywang · binarywang · commit 3d9bc6be0fe5 · 2016-10-09T19:43:09.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
@@ -120,7 +120,7 @@ public WxMpPayRefundResult refund(WxMpPayRefundRequest request, File keyFile)
     request.setSign(sign);
 
     String url = PAY_BASE_URL + "/secapi/pay/refund";
-    String responseContent = this.executeRequestWithKeyFile(url, xstream.toXML(request), keyFile, partnerId);
+    String responseContent = this.executeRequestWithKeyFile(url, keyFile, xstream.toXML(request), partnerId);
     WxMpPayRefundResult wxMpPayRefundResult = (WxMpPayRefundResult) xstream.fromXML(responseContent);
 
     if (!"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getResultCode())
@@ -181,7 +181,7 @@ public WxRedpackResult sendRedpack(WxSendRedpackRequest request, File keyFile)
       url = PAY_BASE_URL + "/mmpaymkttransfers/sendgroupredpack";
     }
 
-    String responseContent = this.executeRequestWithKeyFile(url, xstream.toXML(request), keyFile, mchId);
+    String responseContent = this.executeRequestWithKeyFile(url, keyFile, xstream.toXML(request), mchId);
     WxRedpackResult redpackResult = (WxRedpackResult) xstream
         .fromXML(responseContent);
     if ("FAIL".equals(redpackResult.getResultCode())) {
@@ -360,7 +360,7 @@ public WxEntPayResult entPay(WxEntPayRequest request, File keyFile) throws WxErr
 
     String url = PAY_BASE_URL + "/mmpaymkttransfers/promotion/transfers";
 
-    String responseContent = this.executeRequestWithKeyFile(xstream.toXML(request), url, keyFile, request.getMchId());
+    String responseContent = this.executeRequestWithKeyFile(url, keyFile, xstream.toXML(request), request.getMchId());
     WxEntPayResult result = (WxEntPayResult) xstream.fromXML(responseContent);
     if ("FAIL".equals(result.getResultCode())) {
       throw new WxErrorException(
@@ -369,7 +369,7 @@ public WxEntPayResult entPay(WxEntPayRequest request, File keyFile) throws WxErr
     return result;
   }
 
-  private String executeRequestWithKeyFile( String requestStr, String url, File keyFile, String mchId) throws WxErrorException {
+  private String executeRequestWithKeyFile( String url, File keyFile, String requestStr, String mchId) throws WxErrorException {
     try (FileInputStream inputStream = new FileInputStream(keyFile)) {
       KeyStore keyStore = KeyStore.getInstance("PKCS12");
       keyStore.load(inputStream, mchId.toCharArray());
