From c007868c62c7da5c9ce1bf0e77d9e5f8619826e4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 12 六月 2019 12:24:09 +0800 Subject: [PATCH] 查询默认有效调整 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 57 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 25 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java index 6c249ac..bed6ecc 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java @@ -150,7 +150,10 @@ } @Override - public UserInfoExtra updateUserRankByUid(Long uid) throws UserInfoExtraException{ + public void updateUserRankByUid(Long uid) throws UserInfoExtraException{ + if (uid == null || uid == 0) { + return; + } boolean isupdateRank = true; @@ -173,8 +176,6 @@ if (isupdateRank) { updateRank(userInfoExtra); } - - return userInfoExtra; } @Override @@ -385,7 +386,7 @@ @Override public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{ if (uid == null || code == null) { - throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖"); + throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣"); } // 鐢ㄦ埛淇℃伅 @@ -403,9 +404,8 @@ } } - // 鑾峰彇寰俊淇℃伅 - WeiXinUser weiXinUser = WXLoginUtil.getWeiXinWYUser(code); + WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code); if (weiXinUser == null) { throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触"); } @@ -414,24 +414,31 @@ throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触"); } - - // 鑷姩缁戝畾寰俊 - UserInfo updateUserInfo = new UserInfo(uid); - updateUserInfo.setWxName(weiXinUser.getNickname()); - 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()); + // 楠岃瘉鏁版嵁 + String wxUnionIdExist = invitee.getWxUnionId(); + if (StringUtil.isNullOrEmpty(wxUnionIdExist)) { + UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid()); + if (newUser != null) { + throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�"); + } + + // 鑷姩缁戝畾寰俊 + 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()); + } + if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) { + updateUserInfo.setWxPic(weiXinUser.getHeadimgurl()); + updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); + } + userInfoService.updateByPrimaryKeySelective(updateUserInfo); + + } else if (!wxUnionId.equals(wxUnionIdExist)){ + throw new UserInfoExtraException(1, "缁戝畾寰俊涓庢縺娲诲井淇′笉涓�鑷�"); } - - if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) { - updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); - } - userInfoService.updateByPrimaryKeySelective(updateUserInfo); - // 閭�璇蜂汉ID -1.5.3鏂扮増 @@ -453,7 +460,7 @@ // 娌℃湁琚個璇疯繃 if (inviterId == null && threeSale == null) { - throw new UserInfoExtraException(1, "寰俊婵�娲诲け璐�"); + throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�"); } // 缁戝畾鍏崇郴 @@ -465,7 +472,7 @@ } catch (Exception e1) { e1.printStackTrace(); } - throw new UserInfoExtraException(1, "婵�娲诲け璐�"); + throw new UserInfoExtraException(1, "鍏崇郴缁戝畾鏃跺け璐�"); } -- Gitblit v1.8.0