修改部分bug

admin

2019-06-05 07c13064382007999e87abe81efe76c98a47dce8

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -677,6 +677,14 @@
         updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());

         userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

      }



      try {

         // 第一次登录时创建用户额外信息

         userInfoExtraService.createUserInfoExtra(user.getId());

      } catch (Exception e) {

         e.printStackTrace();

      }



   }



   @Override

@@ -917,7 +925,7 @@
      phone = phone.replaceAll(" ", "");



      // 苹果应用商店上线测试号码

      if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {

      if ("17316780233".equalsIgnoreCase(phone) && "2581".equalsIgnoreCase(vcode)) {

         ;

      } else {



@@ -927,11 +935,12 @@


         String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);

         LogHelper.test("----------------------登录验证码： " + oldVcode);

         if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

            throw new UserAccountException(1, "验证码错误，重新输入");

         }

         if (!Constant.IS_TEST)

            if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

               throw new UserAccountException(1, "验证码错误，重新输入");

            }

      }

		


      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("phone", phone);

@@ -944,13 +953,11 @@
      if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {

         throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

      }

		
		


      // 清空限制

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

      // 清理次数

      redisManager.removeCommonString("sendMSNLoginCount" + phone);

		


      // 查询是否存在该电话历史用户

      UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);

@@ -1007,9 +1014,13 @@
      UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

      // 直接用的微信登录

      if (userInfo != null) {

         LogHelper.test("微信unionID存在:" + weiXinUser.getUnionid());

         // 更新账户登录信息

         updateLonginInfo(userInfo, loginType, request);

         // 删除邀请分享图

         spreadUserImgService.deleteImgUrl(userInfo.getId());

      } else {

         LogHelper.test("微信unionID不存在:" + weiXinUser.getUnionid());

         // 创建新账户

         userInfo = new UserInfo();

         userInfo.setPortrait(weiXinUser.getHeadimgurl());

@@ -1101,17 +1112,22 @@
         throw new UserAccountException(2, "微信帐号授权失败");

      }



      if (weiXinUser.getUnionid().equalsIgnoreCase(user.getWxUnionId())) {

      String wxUnionId = weiXinUser.getUnionid();

      if (StringUtil.isNullOrEmpty(wxUnionId)) {

         throw new UserAccountException(2, "微信帐号授权失败");

      }



      String wxUnionIdExist = user.getWxUnionId();

      if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {

         UserInfo newUser = userInfoMapper.getEffectiveUserInfoByWXUnionId(wxUnionId);

         if (newUser != null) {

            throw new UserAccountException(4, "该微信号已被其他帐号绑定");

         }

      } else if (wxUnionId.equals(wxUnionIdExist)) {

         throw new UserAccountException(3, "微信帐号一致无需更换");

      }



      UserInfo newUser = userInfoMapper.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

      if (newUser != null) {

         throw new UserAccountException(4, "该微信号已被其他帐号绑定");

      }



      String wxUnionId = user.getWxUnionId();

      if (!StringUtil.isNullOrEmpty(wxUnionId) && StringUtil.isNullOrEmpty(user.getPhone())) {

      if (StringUtil.isNullOrEmpty(user.getPhone())) {

         throw new UserAccountException(5, "该帐号没有绑定手机号码，需绑定手机号码才能完成微信更换");

      }



@@ -1120,14 +1136,19 @@
      updateUserInfo.setWxOpenId(weiXinUser.getOpenid());

      updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());

      updateUserInfo.setWxUnionId(weiXinUser.getUnionid());

      updateUserInfo.setNickName(weiXinUser.getNickname());

      updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());

      if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {

         updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());



      // 将默认昵称替换成微信昵称

      String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();

      if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName)

            && defaultNickName.equals(user.getNickName())) {

         updateUserInfo.setNickName(weiXinUser.getNickname());

      }



      if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {

         updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());

      // 将默认头像替换成微信头像

      String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();

      if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)

            && defaultPortrait.equals(user.getPortrait())) {

         updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());

      }

      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);