yujian
2019-05-23 418678a2f6eeeb9de97795a26277d7c5c64c282d
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -925,7 +925,7 @@
      phone = phone.replaceAll(" ", "");
      // 苹果应用商店上线测试号码
      if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {
      if ("17316780233".equalsIgnoreCase(phone) && "2581".equalsIgnoreCase(vcode)) {
         ;
      } else {
@@ -1135,14 +1135,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());
      }
      if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
         updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
      // 将默认昵称替换成微信昵称
      String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
      if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName)
            && defaultNickName.equals(user.getNickName())) {
         updateUserInfo.setNickName(weiXinUser.getNickname());
      }
      // 将默认头像替换成微信头像
      String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
      if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
            && defaultPortrait.equals(user.getPortrait())) {
         updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
      }
      userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);