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);