返回请求修改

nafmii-app/src/main/java/org/nafmii/app/user/service/impl/UserServiceImpl.java

@@ -100,7 +100,7 @@ public class UserServiceImpl implements UserService {
         //查询用户信息通过手机号
         //查询用户信息通过手机号
         UserVO userVO = appUserMapper.selectByPhone(registerDto.getPhone());
         UserVO userVO = appUserMapper.selectByPhone(registerDto.getPhone());
         if (null != userVO){
         if (null != userVO){
-            throw new BusinessException("该用户已注册");
+            return new ApiResponse(ApiResponse.FAIL,"该用户已注册");
         }
         }
         //用户实体类
         //用户实体类
         AppUserPO appUser = new AppUserPO();
         AppUserPO appUser = new AppUserPO();
@@ -112,7 +112,7 @@ public class UserServiceImpl implements UserService {
         appUser.setPhone(registerDto.getPhone());
         appUser.setPhone(registerDto.getPhone());
         //判断注册密码和再次输入密码
         //判断注册密码和再次输入密码
         if (!registerDto.getLoginPwd().equals(registerDto.getConfirmPwd())){
         if (!registerDto.getLoginPwd().equals(registerDto.getConfirmPwd())){
-            throw new BusinessException("两次密码输入不相同，请再次输入");
+            return new ApiResponse(ApiResponse.FAIL,"两次密码输入不相同，请再次输入");
         }
         }
         appUser.setLoginPwd(registerDto.getLoginPwd());
         appUser.setLoginPwd(registerDto.getLoginPwd());
         appUser.setCreateTime(LocalDateTime.now());
         appUser.setCreateTime(LocalDateTime.now());
@@ -125,16 +125,16 @@ public class UserServiceImpl implements UserService {
         String code = stringRedisTemplate.opsForValue().get(USER_CODE_KEY+registerDto.getPhone());
         String code = stringRedisTemplate.opsForValue().get(USER_CODE_KEY+registerDto.getPhone());
         log.info("冲缓存中获取的验证码===============》{}",code);
         log.info("冲缓存中获取的验证码===============》{}",code);
         if (null == code){
         if (null == code){
-            throw new BusinessException("验证码已过期");
+            return new ApiResponse(ApiResponse.FAIL,"验证码已过期");
         }
         }
         if (!code.equals(registerDto.getCode())){
         if (!code.equals(registerDto.getCode())){
-            throw new BusinessException("验证码错误请重新输入");
+            return new ApiResponse(ApiResponse.FAIL,"验证码错误请重新输入");
         }
         }
         int i = appUserMapper.insert(appUser);
         int i = appUserMapper.insert(appUser);
         if (i<0){
         if (i<0){
-            return new ApiResponse().fail("新增失败");
+            return new ApiResponse(ApiResponse.FAIL,"新增失败");
         }
         }
-        return new ApiResponse();
+        return new ApiResponse(ApiResponse.SUCCESS,"新增成功");
     }
     }
 
 
     /**
     /**
@@ -152,21 +152,21 @@ public class UserServiceImpl implements UserService {
             //密码登陆
             //密码登陆
             userVo = appUserMapper.selectByPassword(loginDto);
             userVo = appUserMapper.selectByPassword(loginDto);
             if (null == userVo){
             if (null == userVo){
-                throw new BusinessException("请先注册");
+                return new ApiResponse(ApiResponse.FAIL,"请先注册");
             }
             }
         }else{
         }else{
             //验证码登陆
             //验证码登陆
             String code = stringRedisTemplate.opsForValue().get(USER_CODE_KEY+loginDto.getPhone());
             String code = stringRedisTemplate.opsForValue().get(USER_CODE_KEY+loginDto.getPhone());
             log.info("冲redis中获取的验证码===============》{}",code);
             log.info("冲redis中获取的验证码===============》{}",code);
             if (null == code){
             if (null == code){
-                throw new BusinessException("验证码已过期");
+                return new ApiResponse(ApiResponse.FAIL,"验证码已过期");
             }
             }
             if (!code.equals(loginDto.getCode())){
             if (!code.equals(loginDto.getCode())){
-                throw new BusinessException("验证码错误请重新输入");
+                return new ApiResponse(ApiResponse.FAIL,"验证码错误请重新输入");
             }
             }
              userVo = appUserMapper.selectByPhone(loginDto.getPhone());
              userVo = appUserMapper.selectByPhone(loginDto.getPhone());
             if (null != userVo){
             if (null != userVo){
-                throw new BusinessException("请先注册");
+                return new ApiResponse(ApiResponse.FAIL,"请先注册");
             }
             }
         }
         }
         Map<String,Object> map = new HashMap<>();
         Map<String,Object> map = new HashMap<>();