Commit 87a82ef8 authored by wudi's avatar wudi

update

parent d3208344
......@@ -425,19 +425,17 @@ public class WeChatController implements IBaseController {
if ("baitiao".equals(merchant.getName())) {
return userUIAddr + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom=198";
} else if ("wechat-pay".equals(merchant.getName())) {
return userUIAddr + "/landing?key=wechat-pay&target=cashTarget4&channelId=1&registerFrom" + registerFrom;
return userUIAddr + "/landing?key=wechat-pay&target=cashTarget5&channelId=1&registerFrom" + registerFrom;
} else {
return userUIAddr + "/landing?key=xyqb&target=cashTarget4&channelId=1&registerFrom=" + registerFrom;
}
}
private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom) {
LOGGER.info("merchantName={}",merchant.getName());
if ("baitiao".equals(merchant.getName())) {
return userUIAddr + "/landing?key=baitiao&target=cashTarget5&registerFrom=198&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
} else if ("wechat-pay".equals(merchant.getName())) {
LOGGER.info("url={}",userUIAddr + "/landing?key=wechat-pay&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId());
return userUIAddr + "/landing?key=wechat-pay&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
return userUIAddr + "/landing?key=wechat-pay&target=cashTarget5&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
} else {
return userUIAddr + "/landing?key=xyqb&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
}
......
......@@ -63,7 +63,6 @@ public class PlatformAPIController implements IBaseController {
if (merchantConfig == null) {
return JsonResult.buildSuccessResult("", null);
}
LOGGER.info("merchantConfig={}",merchantConfig);
return JsonResult.buildSuccessResult("", ImmutableMap.of("type", "external", "transition", merchantConfig.getConfigValue()));
}
if (StringUtils.isEmpty(nextPage)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment