20210926绑定手机号不需要验证码

signin/src/main/java/com/ccsens/signin/api/UserController.java

@@ -216,6 +216,29 @@ public class UserController {
         return JsonResponse.newInstance().ok(tokenBean);
     }
 
+
+    @ApiOperation(value = "/绑定手机号（不用验证码）",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="/bindingNoCode",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<UserVo.TokenBean> bindingPhoneNoCode(HttpServletRequest request,
+                                                       @ApiParam @RequestBody UserDto.WxBindingPhone wxPhone) throws Exception {
+        Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+        UserVo.UserSign userSignVo = userService.bindingPhoneNoCode(currentUserId,wxPhone);
+
+        UserVo.TokenBean tokenBean = null;
+        if (ObjectUtil.isNotNull(userSignVo)) {
+            WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1);
+            WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3);
+            Map<String, Object> theMap = CollectionUtil.newHashMap();
+            theMap.put("authId", String.valueOf(userSignVo.getAuthId()));
+            tokenBean = userService.getUserInfoAndToken(clientType,identifyType, userSignVo, theMap);
+        }
+        return JsonResponse.newInstance().ok(tokenBean);
+    }
+
+
+
     @ApiOperation(value = "/更改绑定手机", notes = "")
     @ApiImplicitParams({
     })

signin/src/main/java/com/ccsens/signin/service/IUserService.java

@@ -101,4 +101,12 @@ public interface IUserService {
      * @return 返回图片转成的base64字符串，和图片的id
      */
     UserVo.VerificationCode getVertifyCode();
+
+    /**
+     * 绑定手机号不用验证码
+     * @param currentUserId userId
+     * @param wxPhone 手机号
+     * @return
+     */
+    UserVo.UserSign bindingPhoneNoCode(Long currentUserId, UserDto.WxBindingPhone wxPhone);
 }

signin/src/main/java/com/ccsens/signin/service/UserService.java

@@ -97,6 +97,7 @@ public class UserService implements IUserService {
 
     /**
      * 企业登录
+     *
      * @return 返回用户信息
      */
     private UserVo.UserSign wxEnterpriseLogin(String identifier, String credential, String redirect) {
@@ -309,7 +310,6 @@ public class UserService implements IUserService {
     }
 
 
-
     /**
      * 账号登录
      */
@@ -448,6 +448,7 @@ public class UserService implements IUserService {
 
     /**
      * 获取企业微信信息，并绑定用户
+     *
      * @param identifyType 登录类型
      * @param userid       userId
      * @param corpId       corpId
@@ -813,6 +814,54 @@ public class UserService implements IUserService {
         return userSignVo;
     }
 
+    /**
+     * 绑定手机号（不用验证码）
+     *
+     * @param currentUserId userId
+     * @param wxPhone       手机号
+     * @return 用户id和认证类型
+     */
+    @Override
+    public UserVo.UserSign bindingPhoneNoCode(Long currentUserId, UserDto.WxBindingPhone wxPhone) {
+        UserVo.UserSign userSignVo;
+        //查找该用户以前绑定的手机
+        SysAuthExample authExample = new SysAuthExample();
+        authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value)
+                .andUserIdEqualTo(currentUserId);
+        List<SysAuth> authList = authDao.selectByExample(authExample);
+        if (CollectionUtil.isNotEmpty(authList)) {
+            throw new BaseException(CodeEnum.ALREADY_BINDING_PHONE);
+        } else {
+            //改手机对应账户，如果有，提示
+            List<SysAuth> phoneList;
+            SysAuthExample phoneExample = new SysAuthExample();
+            phoneExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value)
+                    .andIdentifierEqualTo(wxPhone.getPhone());
+            phoneList = authDao.selectByExample(phoneExample);
+            if (CollectionUtil.isNotEmpty(phoneList)) {
+                throw new BaseException(CodeEnum.MERGE_WX_PHONE);
+            } else {
+                //绑定 添加auth
+                SysAuth auth = new SysAuth();
+                auth.setId(snowflake.nextId());
+                auth.setUserId(currentUserId);
+                auth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Phone.value);
+                auth.setIdentifier(wxPhone.getPhone());
+                authDao.insertSelective(auth);
+
+                //给所有手机号一样的角色添加userId
+                relevanceUserService.relevancePhone(wxPhone.getPhone(), currentUserId);
+                //返回值
+                userSignVo = new UserVo.UserSign();
+                userSignVo.setAuthId(auth.getId());
+                userSignVo.setUserId(auth.getUserId());
+            }
+        }
+
+        return userSignVo;
+    }
+
+
     /**
      * 更改绑定手机号
      */
@@ -931,6 +980,7 @@ public class UserService implements IUserService {
 
     /**
      * 通过用户查找手机号
+     *
      * @param userId userId
      * @return 手机号
      */
@@ -1030,6 +1080,7 @@ public class UserService implements IUserService {
 
     /**
      * 合并账号
+     *
      * @param currentUserId userId
      * @param mergePhone    手机号和合并方式
      * @return 用户id
@@ -1143,6 +1194,7 @@ public class UserService implements IUserService {
 
     /**
      * 修改用户信息（添加微信信息）
+     *
      * @return 返回信息
      */
     @Override