Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

 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 {



@@ -931,7 +939,7 @@
            throw new UserAccountException(1, "验证码错误，重新输入");

         }

      }

		


      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("phone", phone);

@@ -944,13 +952,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 +1013,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());