fanli-server.git

			@@ -41,7 +41,6 @@
			import com.yeshi.fanli.util.wx.WXLoginUtil;
			import com.yeshi.fanli.vo.user.UserInfoExtraVO;


			@Service
			public class UserInfoExtraServiceImpl implements UserInfoExtraService {

			@@ -74,7 +73,6 @@

			@Resource
			private UserInviteRecordService userInviteRecordService;


			@Override
			public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
			@@ -194,7 +192,6 @@
			userInfoExtraMapper.insertSelective(userInfoExtra);
			}


			@Override
			public UserInfoExtra updateRank(UserInfoExtra userInfoExtra) throws UserInfoExtraException {
			UserInfo userInfo = userInfoExtra.getUserInfo();
			@@ -258,7 +255,6 @@
			userInfoExtra.setRankOrderNum(selfOrderNum);
			userInfoExtra.setRankSource(Constant.TYPE_REBATE);
			}


			if (rank != null) {
			userInfoExtra.setUserRank(rank);
			@@ -360,7 +356,6 @@
			throw new UserInfoExtraException(1, "激活失败");
			}


			// 邀请码有效、生成邀请码
			String code = UserUtil.getInviteCode(uid);
			if (code == null \|\| code.trim().length() == 0) {
			@@ -374,7 +369,6 @@
			// 保存额外信息
			saveUserInfoExtra(userInfoExtra);


			Long id = userInfoExtra.getId();
			if (id == null) {
			throw new UserInfoExtraException(1, "激活码生成失败");
			@@ -382,7 +376,6 @@

			return code;
			}


			@Override
			public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException{
			@@ -406,7 +399,8 @@
			}

			// 获取微信信息
			WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code,wxAccount.getAppId(),wxAccount.getAppSecret());
			WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, wxAccount.getAppId(),
			wxAccount.getAppSecret());
			if (weiXinUser == null) {
			throw new UserInfoExtraException(1, "微信授权失败");
			}
			@@ -434,7 +428,8 @@
			String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
			if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
			defaultNickName = defaultNickName + uid;
			if ((defaultNickName.equals(invitee.getNickName()) \|\| "返利券".equals(invitee.getNickName()))) {
			if ((defaultNickName.equals(invitee.getNickName()) \|\| "返利券".equals(invitee.getNickName())
			\|\| invitee.getNickName().startsWith(Constant.systemCommonConfig.getDefaultNickName()))) {
			updateUserInfo.setNickName(weiXinUser.getNickname());
			}
			}
			@@ -451,7 +446,6 @@
			} else if (!wxUnionId.equals(wxUnionIdExist)){
			throw new UserInfoExtraException(1, "绑定微信与激活微信不一致");
			}


			// 邀请人ID -1.5.3新版
			Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
			@@ -487,7 +481,6 @@
			throw new UserInfoExtraException(1, "关系绑定时失败");
			}


			// 邀请码有效、生成邀请码
			String inviteCode = UserUtil.getInviteCode(uid);
			if (inviteCode == null \|\| inviteCode.trim().length() == 0) {
			@@ -507,7 +500,6 @@
			}
			}


			@Override
			public UserInfoExtra getUserInfoExtra(Long uid) {
			return userInfoExtraMapper.getInfoExtraByUid(uid);
			@@ -517,7 +509,6 @@
			public UserInfoExtraVO getInfoExtraVOByUid(Long uid) {
			return userInfoExtraMapper.getInfoExtraVOByUid(uid);
			}


			@Override
			public String getUserInviteCode(Long uid) throws UserInfoExtraException {
			@@ -578,7 +569,6 @@
			return isNew;
			}


			@Override
			public UserRank gerUserRank(Long uid) {
			if(uid == null) {
			@@ -592,8 +582,6 @@
			return userInfoExtra.getUserRank();
			}



			@Override
			public UserInfo getUserByInviteCode(String inviteCode) throws UserInfoExtraException{
			if (StringUtil.isNullOrEmpty(inviteCode)) {
			@@ -606,7 +594,6 @@
			}
			return inviter;
			}


			@Override
			public UserInfo getInviterInfo(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException{