|
@@ -781,9 +781,9 @@ public class SysUserController extends BaseController {
|
|
|
if (StringUtils.isNullOrEmpty(dto.getFlag())) {
|
|
if (StringUtils.isNullOrEmpty(dto.getFlag())) {
|
|
|
return HttpResult.error("个代、出单员标识不能为空");
|
|
return HttpResult.error("个代、出单员标识不能为空");
|
|
|
}
|
|
}
|
|
|
-// if (StringUtils.isNullOrEmpty(dto.getMobile()) || StringUtils.isNullOrEmpty(dto.getMobileMsg())) {
|
|
|
|
|
-// return HttpResult.error("手机号、验证码不能为空");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ if (StringUtils.isNullOrEmpty(dto.getMobile()) || StringUtils.isNullOrEmpty(dto.getMobileMsg())) {
|
|
|
|
|
+ return HttpResult.error("手机号、验证码不能为空");
|
|
|
|
|
+ }
|
|
|
if (StringUtils.isNullOrEmpty(dto.getName())) {
|
|
if (StringUtils.isNullOrEmpty(dto.getName())) {
|
|
|
return HttpResult.error("姓名不能为空");
|
|
return HttpResult.error("姓名不能为空");
|
|
|
}
|
|
}
|
|
@@ -793,14 +793,14 @@ public class SysUserController extends BaseController {
|
|
|
if (StringUtils.isNullOrEmpty(dto.getReferrerId())) {
|
|
if (StringUtils.isNullOrEmpty(dto.getReferrerId())) {
|
|
|
return HttpResult.error("推荐人不能为空");
|
|
return HttpResult.error("推荐人不能为空");
|
|
|
}
|
|
}
|
|
|
-// String captcha_redis = (String) redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
|
|
|
|
|
-// redisTemplate.delete(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
|
|
|
|
|
-// if (captcha_redis == null) {
|
|
|
|
|
-// return HttpResult.error("验证码已失效");
|
|
|
|
|
-// }
|
|
|
|
|
-// if (!dto.getMobileMsg().equals(captcha_redis)) {
|
|
|
|
|
-// return HttpResult.error("验证码错误");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ String captcha_redis = (String) redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
|
|
|
|
|
+ redisTemplate.delete(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
|
|
|
|
|
+ if (captcha_redis == null) {
|
|
|
|
|
+ return HttpResult.error("验证码已失效");
|
|
|
|
|
+ }
|
|
|
|
|
+ if (!dto.getMobileMsg().equals(captcha_redis)) {
|
|
|
|
|
+ return HttpResult.error("验证码错误");
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
String recommenderid = dto.getReferrerId();
|
|
String recommenderid = dto.getReferrerId();
|
|
|
SysUser recommender = sysUserService.getById(recommenderid);
|
|
SysUser recommender = sysUserService.getById(recommenderid);
|