Commit 59e307b8 by chongli

修复用户动态码登录问题

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