From a4d660e7b0c72c0bf177c377005c05e60363bdac Mon Sep 17 00:00:00 2001 From: jinyu Date: Sat, 21 Nov 2015 21:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E8=A6=81=EF=BC=9Acom.foxinmy.weixin4j?= =?UTF-8?q?.payment.mch.MchPayPackage=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9EnotifyUrl=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?URL=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foxinmy/weixin4j/payment/PayUtil.java | 13 +++++++------ .../foxinmy/weixin4j/payment/mch/MchPayPackage.java | 8 ++++---- .../java/com/foxinmy/weixin4j/mp/test/PayTest.java | 3 +-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayUtil.java index c8500997..d8f74a7f 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayUtil.java @@ -17,12 +17,12 @@ import com.foxinmy.weixin4j.payment.mch.Order; import com.foxinmy.weixin4j.payment.mch.PrePay; import com.foxinmy.weixin4j.type.SignType; import com.foxinmy.weixin4j.type.TradeType; -import com.foxinmy.weixin4j.util.Weixin4jConfigUtil; import com.foxinmy.weixin4j.util.DateUtil; import com.foxinmy.weixin4j.util.DigestUtil; import com.foxinmy.weixin4j.util.MapUtil; import com.foxinmy.weixin4j.util.RandomUtil; import com.foxinmy.weixin4j.util.StringUtil; +import com.foxinmy.weixin4j.util.Weixin4jConfigUtil; import com.foxinmy.weixin4j.xml.XmlStream; /** @@ -81,8 +81,7 @@ public class PayUtil { String orderNo, double orderFee, String notifyUrl, String ip, WeixinPayAccount weixinAccount) throws PayException { MchPayPackage payPackage = new MchPayPackage(weixinAccount, openId, - body, orderNo, orderFee, ip, TradeType.JSAPI); - payPackage.setNotifyUrl(notifyUrl); + body, orderNo, orderFee, notifyUrl, ip, TradeType.JSAPI); return createPayJsRequestJson(payPackage, weixinAccount); } @@ -228,6 +227,8 @@ public class PayUtil { * 商户内部唯一订单号 * @param totalFee * 商品总额 单位元 + * @param notifyUrl + * 支付回调URL * @param createIp * 订单生成的机器 IP * @return 支付链接 @@ -238,10 +239,10 @@ public class PayUtil { */ public static String createNativePayRequestURL( WeixinPayAccount weixinAccount, String productId, String body, - String outTradeNo, double totalFee, String createIp) - throws PayException { + String outTradeNo, double totalFee, String notifyUrl, + String createIp) throws PayException { MchPayPackage payPackage = new MchPayPackage(weixinAccount, null, body, - outTradeNo, totalFee, createIp, TradeType.NATIVE); + outTradeNo, totalFee, createIp, notifyUrl, TradeType.NATIVE); payPackage.setProductId(productId); String paySignKey = weixinAccount.getPaySignKey(); payPackage.setSign(paysignMd5(payPackage, paySignKey)); diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java index 4ffce52a..8eb208ef 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java @@ -69,7 +69,7 @@ public class MchPayPackage extends PayPackage { @JSONField(name = "openid") private String openId; /** - * 只在 trade_type 为 NATIVE 时需要填写 非必须 + * 只在 trade_type 为 NATIVE 且【模式一】 时需要填写 非必须 */ @XmlElement(name = "product_id") @JSONField(name = "product_id") @@ -80,10 +80,10 @@ public class MchPayPackage extends PayPackage { } public MchPayPackage(WeixinPayAccount weixinAccount, String openId, - String body, String outTradeNo, double totalFee, + String body, String outTradeNo, double totalFee, String notifyUrl, String spbillCreateIp, TradeType tradeType) { - this(weixinAccount, openId, body, null, outTradeNo, totalFee, null, - spbillCreateIp, tradeType); + this(weixinAccount, openId, body, null, outTradeNo, totalFee, + notifyUrl, spbillCreateIp, tradeType); } public MchPayPackage(WeixinPayAccount weixinAccount, String openId, diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/PayTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/PayTest.java index 05f353a2..72f34221 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/PayTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/PayTest.java @@ -137,9 +137,8 @@ public class PayTest { public void nativeV3() throws WeixinException { MchPayPackage payPackageV3 = new MchPayPackage(ACCOUNT3, "oyFLst1bqtuTcxK-ojF8hOGtLQao", "native测试", "T0001", 0.1d, - "127.0.0.1", TradeType.NATIVE); + "notify_url", "127.0.0.1", TradeType.NATIVE); payPackageV3.setProductId("0001"); - payPackageV3.setNotifyUrl("xxxx"); PrePay prePay = null; try { prePay = PayUtil.createPrePay(payPackageV3,