app端绑定手机号

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -205,7 +205,7 @@ public class LoginService implements ILoginService {
                 .eq("wechat_open_id", openId)
         );
         if (userAccount == null) {
-            return RestResponse.fail(ApiConstants.RESULT_NO_DATA, "微信号尚未绑定用户信息");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "未绑定微信号，请登录绑定微信号");
         }
         //用户存在，关联登录成功
         //登录成功初始化登录信息
@@ -261,28 +261,14 @@ public class LoginService implements ILoginService {
 
     @Override
     public RestResponse appBindMobile(HttpServletRequest request, UserRequest userRequest) {
-        //校验手机号和短信验证码
-        if (StringUtils.isBlank(userRequest.getMobile())) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号为空无法绑定");
-        }
-        UserAccount userAccount = userAccountService.getByMobile(userRequest.getMobile());
-        if (userAccount == null) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "当前手机号尚未注册，请先注册再绑定");
-        }
+        UserAccount userAccount = userAccountService.getByUserId(userRequest.getUserId());
         //通过授权码获取用户openId
         String openId = userRequest.getWeChatOpenId();
         userAccount.setWechatOpenId(openId);
-        if (!userAccountService.save(userAccount)) {
+        if (!userAccountService.updateById(userAccount)) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "绑定手机号失败");
         }
-        userRequest.setUserId(userAccount.getUserId());
-        UserResponse userResponse = initLoginInfo(request, userRequest);
-        userLoginService.saveLoginInfo(request, userAccount.getUserId());
-        //用户登录成功，更新用户设备信息
-        if (appLoginSaveDeviceInfo(userRequest, userRequest.getMobileType(), userAccount)) {
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新设备类型失败");
-        }
-        return RestResponse.success(userResponse, ApiConstants.RESULT_SUCCESS, "绑定手机号成功");
+        return RestResponse.success(ApiConstants.RESULT_SUCCESS, "绑定手机号成功");
     }
 
     private RestResponse checkMobileAndSmsCode(UserRequest userRequest) {