Commit 0f0ab055 authored by lee_mingzhu's avatar lee_mingzhu

remove phone_no column

parent dca45e7f
...@@ -382,13 +382,8 @@ public class UserController implements IBaseController { ...@@ -382,13 +382,8 @@ public class UserController implements IBaseController {
User user = verificateUserNameAndPassword(request, openId); User user = verificateUserNameAndPassword(request, openId);
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("用户名或密码不正确", null); return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
} else {
//id为-1,微信重复绑定的标示.
if(user.getId() == -1L) {
return JsonResult.buildErrorStateResult("该手机号已绑定了其他微信账号.", null);
}
return new JsonResult(sessionService.createSession(channelId, createdFrom, appChannel, user, merchant));
} }
return new JsonResult(sessionService.createSession(channelId, createdFrom, appChannel, user, merchant));
} }
private User verificateUserNameAndPassword(HttpServletRequest request, String openId) { private User verificateUserNameAndPassword(HttpServletRequest request, String openId) {
...@@ -410,9 +405,9 @@ public class UserController implements IBaseController { ...@@ -410,9 +405,9 @@ public class UserController implements IBaseController {
} }
String userName = credentialArr[0]; String userName = credentialArr[0];
String pass = credentialArr[1]; String pass = credentialArr[1];
/*//判断是否微信登录(openId不为空,认为是微信登录) //判断是否微信登录(openId不为空,认为是微信登录)
if(StringUtils.isNotEmpty(openId)) { /*if(StringUtils.isNotEmpty(openId)) {
WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoFromDb(openId); WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoByPhoneNo(userName);
//说明微信用户已经绑定过xyqb用户了 //说明微信用户已经绑定过xyqb用户了
if(wechatUserInfo != null && wechatUserInfo.getUserId() != null && wechatUserInfo.getUserId() != 0L) { if(wechatUserInfo != null && wechatUserInfo.getUserId() != null && wechatUserInfo.getUserId() != 0L) {
//判断绑定的xyqb用户的手机号是否和本次登录的手机号一致 //判断绑定的xyqb用户的手机号是否和本次登录的手机号一致
......
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