Commit 59e307b8 by chongli

修复用户动态码登录问题

parent 3a310484
...@@ -1308,20 +1308,25 @@ public class UserService { ...@@ -1308,20 +1308,25 @@ public class UserService {
if (userVerifyCode.getVerifyTimes() == maxTimes) { if (userVerifyCode.getVerifyTimes() == maxTimes) {
throw new UserException(301, "验证码验证错误次数超过限制"); throw new UserException(301, "验证码验证错误次数超过限制");
} }
UserQuery userQuery = new UserQuery(); UserExt userExt = this.userExtDao.GetUserExtInfoByPhone(request.getLoginName());
userQuery.setUid(request.getLoginName()); if(userExt==null){
userQuery.setImageSize(request.getImageSize()); return null;
UserBean userBean = this.getUserDetail(userQuery); }else{
LoginResultBean loginResultBean = new LoginResultBean(); UserQuery userQuery = new UserQuery();
BeanConverter.copyProperties(loginResultBean, userBean); userQuery.setUid(userExt.getUid());
loginResultBean.setUid(userBean.getUid()); userQuery.setImageSize(request.getImageSize());
String token = this.genericToken(userBean.getUid(), TokenTypeEnum.ACCESS.getKey()); UserBean userBean = this.getUserDetail(userQuery);
loginResultBean.setToken(token); LoginResultBean loginResultBean = new LoginResultBean();
//add by caosy BeanConverter.copyProperties(loginResultBean, userBean);
loginResultBean.setVipmemberDiscountRate(this.genericVipMemberDiscount(userBean.getUid())); loginResultBean.setUid(userBean.getUid());
String token = this.genericToken(userBean.getUid(), TokenTypeEnum.ACCESS.getKey());
this.updateLoginData(request); loginResultBean.setToken(token);
return loginResultBean; //add by caosy
loginResultBean.setVipmemberDiscountRate(this.genericVipMemberDiscount(userBean.getUid()));
this.updateLoginData(request);
return loginResultBean;
}
} }
private void updateLoginData(LoginBean loginBean) { private void updateLoginData(LoginBean loginBean) {
......
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 sign in to comment