From e7f851252d9d46cb7fd03bbf62b865397086c5c0 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 25 Feb 2019 16:13:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WechatLoginController.java | 4 ++-- .../com/iformall/service/impl/MallUserInfoServiceImpl.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java index 4c4af7383..5101b1ecc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java @@ -122,8 +122,8 @@ public class WechatLoginController extends BaseController { log.debug("https://" + host + "/#/layout"); response.sendRedirect("https://" + host + "/#/layout"); } else { - // 返回首页 - log.debug("https://" + host + "/#/"); + // TODO 绑定失败 + log.debug("https://" + host + "/#/layout"); response.sendRedirect("https://" + host + "/#/layout"); } } catch (WxErrorException e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 9bcd76ef1..ec1b7ac1d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -181,7 +181,12 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public ResultData checkCodeValid(MallUserInfo user, String code) { WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - /// wxMsgValidationcode.setTenantId(user.getTenantId()); + if(StringUtils.isNotBlank(user.getTenantId())) { + wxMsgValidationcode.setTenantId(user.getTenantId()); + } else { + // 如果为空, 启用富茂(标准) + wxMsgValidationcode.setTenantId("1"); + } wxMsgValidationcode.setPhone(user.getPhone()); wxMsgValidationcode.setCode(code); List wxmsgvalidationcodelist = wxMsgValidationcodeMapper.findList(wxMsgValidationcode);