yujian
2019-09-03 972d3bc71115ec977dccf835fbcd148da3bcc86c
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.bus.user.UserRankRecord;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.exception.ThreeSaleException;
import com.yeshi.fanli.exception.user.ThreeSaleException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -426,14 +426,25 @@
         UserInfo updateUserInfo = new UserInfo(uid);
         updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
         updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
         if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
            updateUserInfo.setWxName(weiXinUser.getNickname());
            updateUserInfo.setNickName(weiXinUser.getNickname());
         updateUserInfo.setWxName(weiXinUser.getNickname());
         updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
         // 将默认昵称替换成微信昵称
         String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
         if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
            defaultNickName = defaultNickName + uid;
            if ((defaultNickName.equals(invitee.getNickName()) || "返利券".equals(invitee.getNickName()))) {
               updateUserInfo.setNickName(weiXinUser.getNickname());
            }
         }
         if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
            updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
         // 将默认头像替换成微信头像
         String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
         if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
               && defaultPortrait.equals(invitee.getPortrait())) {
            updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
         }
         userInfoService.updateByPrimaryKeySelective(updateUserInfo);
         
      } else if (!wxUnionId.equals(wxUnionIdExist)){