From 3d9bc6be0fe54233d1f5139214de147c9f4e1e2d Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Sun, 9 Oct 2016 19:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 8e3e015e..fa1a44c5 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 @@ -120,7 +120,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { 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 class WxMpPayServiceImpl implements WxMpPayService { 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 class WxMpPayServiceImpl implements WxMpPayService { 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 class WxMpPayServiceImpl implements WxMpPayService { 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());