|
@@ -203,6 +203,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
|
|
|
if (tuple2.getT1()) {
|
|
|
userLoginVO.setUserId(tuple2.getT2());
|
|
|
}
|
|
|
+ userLoginVO.setRegUser(Boolean.FALSE);
|
|
|
//返回登录信息
|
|
|
return ResultVO.ok(userLoginVO);
|
|
|
}
|
|
@@ -214,7 +215,9 @@ public class LoginServiceImpl implements IRegisterLoginService {
|
|
|
//用户注册
|
|
|
user = userCreateSave(userData, username, RegisterUtil.cmfPassword(password), null, null, null);
|
|
|
//返回登录信息
|
|
|
- return ResultVO.ok(this.createUserLoginVO(user, userData));
|
|
|
+ UserLoginVO userLoginVO = this.createUserLoginVO(user, userData);
|
|
|
+ userLoginVO.setRegUser(Boolean.TRUE);
|
|
|
+ return ResultVO.ok(userLoginVO);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -250,13 +253,16 @@ public class LoginServiceImpl implements IRegisterLoginService {
|
|
|
userLoginVO.setUserId(tuple2.getT2());
|
|
|
log.error("导量用户返回用户信息, userLoginVO : {}", JsonUtil.toString(userLoginVO));
|
|
|
}
|
|
|
+ userLoginVO.setRegUser(Boolean.FALSE);
|
|
|
//返回登录信息
|
|
|
return ResultVO.ok(userLoginVO);
|
|
|
}
|
|
|
//用户注册
|
|
|
user = userCreateSave(userData, mobile, null, mobile, null, null);
|
|
|
//返回登录信息
|
|
|
- return ResultVO.ok(this.createUserLoginVO(user, userData));
|
|
|
+ UserLoginVO userLoginVO = this.createUserLoginVO(user, userData);
|
|
|
+ userLoginVO.setRegUser(Boolean.TRUE);
|
|
|
+ return ResultVO.ok(userLoginVO);
|
|
|
}
|
|
|
|
|
|
private Tuple2<Boolean, Long> userGuideCheck(User user) {
|