浏览代码

还原测试注释代码

xuqiang 11 月之前
父节点
当前提交
586f62541b

+ 4 - 4
src/main/java/com/ydtech/modules/admin/controller/SysUserAgentController.java

@@ -57,10 +57,10 @@ public class SysUserAgentController extends BaseController {
     public HttpResult agentRegist(@RequestBody @Validated AgentUserNewDto dto) {
         List<SysUser> list = sysUserService.lambdaQuery().eq(SysUser::getMobile, dto.getMobile()).list();
         AssertionUtils.isFail(!list.isEmpty(), "手机号已经被注册请重新跟换手机号。如有疑问请联系管理人员。");
-//        String captchaRedis = redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
-//        redisTemplate.delete(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
-//        AssertionUtils.isFail(StringUtils.isBlank(captchaRedis), "验证码已失效!");
-//        AssertionUtils.isFail(!dto.getMobileMsg().equals(captchaRedis), "验证码错误!");
+        String captchaRedis = redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
+        redisTemplate.delete(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
+        AssertionUtils.isFail(StringUtils.isBlank(captchaRedis), "验证码已失效!");
+        AssertionUtils.isFail(!dto.getMobileMsg().equals(captchaRedis), "验证码错误!");
         String recommenderid = dto.getReferrerId();
         SysUser recommender = sysUserService.getById(recommenderid);
         AssertionUtils.isFail(Objects.isNull(recommender), "推荐人信息不存在!");

+ 11 - 11
src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -781,9 +781,9 @@ public class SysUserController extends BaseController {
         if (StringUtils.isNullOrEmpty(dto.getFlag())) {
             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())) {
             return HttpResult.error("姓名不能为空");
         }
@@ -793,14 +793,14 @@ public class SysUserController extends BaseController {
         if (StringUtils.isNullOrEmpty(dto.getReferrerId())) {
             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();
         SysUser recommender = sysUserService.getById(recommenderid);