From fdb089cb8bee6099efcbd7b0ca2672c63cbb6784 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 09:33:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java
index d4d707b..5e32520 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/wx/BanLiShopWXPayUtil.java
@@ -33,7 +33,7 @@
* @param money
* @return
*/
- public static String getWXH5PayUrl(String orderNo, String ip, String goodsName, BigDecimal money) {
+ public static String getWXH5PayUrl(String orderNo, String ip, String goodsName, BigDecimal money, String platform) {
String wxOrderNo = BanLiShopOrderUtil.getWXPayOrderNo(orderNo);
WXPlaceOrderParams params = new WXPlaceOrderParams();
params.setBody(goodsName);
@@ -47,8 +47,14 @@
params.setTradeType("MWEB");
try {
Map<String, String> map = WXPayUtil.produceOrder(params);
- return map.get("mweb_url") + "&redirect_url=" + URLEncoder
- .encode("http://shop.banliapp.com/order.html?from=pay", "UTF-8");
+ if ("ios".equalsIgnoreCase(platform))
+ return map.get("mweb_url") + "&redirect_url="
+ + URLEncoder.encode("shop.banliapp.com://shop.banliapp.com/wx_pay_finish.html", "UTF-8");
+ else
+ return map.get("mweb_url") + "&redirect_url="
+ + URLEncoder.encode("http://shop.banliapp.com/wx_pay_finish.html", "UTF-8");
+
+
} catch (WXPlaceOrderParamsException e) {
e.printStackTrace();
} catch (Exception e) {
--
Gitblit v1.8.0