From 235e26f350d73f8ab7a4793e1a2bc5c794eca468 Mon Sep 17 00:00:00 2001 From: jinyu Date: Sat, 19 Dec 2015 18:41:45 +0800 Subject: [PATCH] =?UTF-8?q?createPayRequest=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java | 2 +- .../java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java | 6 +++--- .../com/foxinmy/weixin4j/payment/mch/MchPayRequest.java | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java index 761ca839..0a68bdee 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java @@ -127,7 +127,7 @@ public class Pay3Api { * @return 支付json串 * @throws WeixinPayException */ - public MchPayRequest createPayJsRequestJson(String openId, String body, + public MchPayRequest createPayJsRequest(String openId, String body, String outTradeNo, double totalFee, String notifyUrl, String createIp) throws WeixinPayException { return createPayJsRequest(openId, body, outTradeNo, totalFee, diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java index ff4b1b22..11cfb1b8 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java @@ -111,11 +111,11 @@ public class WeixinPayProxy { * @see com.foxinmy.weixin4j.payment.mch.MchPayRequest * @throws WeixinPayException */ - public MchPayRequest createPayJsRequestJson(String openId, String body, + public MchPayRequest createPayJsRequest(String openId, String body, String outTradeNo, double totalFee, String notifyUrl, String createIp) throws WeixinPayException { - return pay3Api.createPayJsRequestJson(openId, body, outTradeNo, - totalFee, notifyUrl, createIp); + return pay3Api.createPayJsRequest(openId, body, outTradeNo, totalFee, + notifyUrl, createIp); } /** diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java index 02cb77aa..4f694351 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java @@ -43,14 +43,12 @@ public class MchPayRequest extends PayRequest { } public MchPayRequest(PrePay prePay) { - this.setAppId(prePay.getAppId()); - this.setPackageInfo("prepay_id=" + prePay.getPrepayId()); + super(prePay.getAppId(), "prepay_id=" + prePay.getPrepayId()); this.prePay = prePay; } public MchPayRequest(String appId, String prepayId) { - this.setAppId(appId); - this.setPackageInfo("prepay_id=" + prepayId); + super(appId, "prepay_id=" + prepayId); this.prePay = new PrePay(); this.prePay.setAppId(appId); this.prePay.setPrepayId(prepayId);