修改部分bug

admin

2019-06-05 07c13064382007999e87abe81efe76c98a47dce8

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

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

         userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

      }

		


      try {

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

         userInfoExtraService.createUserInfoExtra(user.getId());

      } catch (Exception e) {

         e.printStackTrace();

      }

		


   }



   @Override

@@ -935,9 +935,10 @@


         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();

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

      // 直接用的微信登录

      if (userInfo != null) {

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

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

         // 更新账户登录信息

         updateLonginInfo(userInfo, loginType, request);

         // 删除邀请分享图

         spreadUserImgService.deleteImgUrl(userInfo.getId());

      } else {

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

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

         // 创建新账户

         userInfo = new UserInfo();

         userInfo.setPortrait(weiXinUser.getHeadimgurl());

@@ -1110,12 +1111,12 @@
      if (weiXinUser == null) {

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

      }

		


      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);

@@ -1135,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);