fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -849,11 +849,14 @@ updateUserInfo.setWxOpenId(weiXinUser.getOpenid()); updateUserInfo.setWxPic(weiXinUser.getHeadimgurl()); updateUserInfo.setWxUnionId(weiXinUser.getUnionid()); // 将默认昵称替换成微信昵称 String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) && (defaultNickName.equals(user.getNickName()) || "返利券".equals(user.getNickName()))) { if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { defaultNickName = defaultNickName + uid; if ((defaultNickName.equals(user.getNickName()) || "返利券".equals(user.getNickName()))) { updateUserInfo.setNickName(weiXinUser.getNickname()); } } // 将默认头像替换成微信头像 @@ -1240,10 +1243,12 @@ // 将默认昵称替换成微信昵称 String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) && (defaultNickName.equals(user.getNickName()) || "返利券".equals(user.getNickName()))) { if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { defaultNickName = defaultNickName + uid; if ((defaultNickName.equals(user.getNickName()) || "返利券".equals(user.getNickName()))) { updateUserInfo.setNickName(weiXinUser.getNickname()); } } // 将默认头像替换成微信头像 String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait(); fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -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.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)){ fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -901,8 +901,8 @@ throw new UserInfoException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC); } if (userInfo.getState() != UserInfo.STATE_NORMAL) { throw new UserInfoException(1, "用户不存在"); if (userInfo.getState() == UserInfo.STATE_DELETE || userInfo.getState() == UserInfo.STATE_DELETE_OUT_OF_DATE) { throw new UserInfoException(Constant.CODE_FORBIDDEN_USER, "帐户已被删除，请重新登录"); } // 淘宝昵称 组织
