From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 141 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 116 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..c9b0164 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, "鍏崇郴缁戝畾鏃跺け璐�");
}
@@ -559,4 +566,88 @@
return isNew;
}
+
+ @Override
+ public UserRank gerUserRank(Long uid) {
+ if(uid == null) {
+ return null;
+ }
+
+ UserInfoExtra userInfoExtra = userInfoExtraMapper.gerUserRank(uid);
+ if (userInfoExtra == null) {
+ return null;
+ }
+ return userInfoExtra.getUserRank();
+ }
+
+
+
+ @Override
+ public UserInfo getUserByInviteCode(String inviteCode) throws UserInfoExtraException{
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ throw new UserInfoExtraException(1, "閭�璇风爜涓嶈兘涓虹┖");
+ }
+ // 閭�璇蜂汉淇℃伅
+ UserInfo inviter = userInfoService.getInfoByPhoneOrInviteCode(inviteCode, inviteCode);
+ if (inviter == null) {
+ throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
+ }
+ return inviter;
+ }
+
+
+ @Override
+ public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException{
+ if (code == null) {
+ throw new UserInfoExtraException(1, "code淇℃伅涓嶅畬鏁�");
+ }
+
+ // 鐢ㄦ埛淇℃伅
+ UserInfo invitee = userInfoService.selectByPKey(uid);
+ if (invitee == null) {
+ throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
+ }
+
+ // 鐢ㄦ埛棰濆淇℃伅
+ UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (extra != null) {
+ String inviteCodeHas = extra.getInviteCode();
+ if (inviteCodeHas != null && inviteCodeHas.trim().length() > 0) {
+ throw new UserInfoExtraException(1, "宸茬粡婵�娲�, 鏃犻渶鍐嶆婵�娲�");
+ }
+ }
+
+ // 鑾峰彇寰俊淇℃伅
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ if (weiXinUser == null) {
+ throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
+ }
+ String wxUnionId = weiXinUser.getUnionid();
+ if (wxUnionId == null || wxUnionId.trim().length() == 0) {
+ throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
+ }
+
+ // 楠岃瘉鏁版嵁
+ String wxUnionIdExist = invitee.getWxUnionId();
+ if (StringUtil.isNullOrEmpty(wxUnionIdExist)) {
+ UserInfo newUser = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());
+ if (newUser != null) {
+ throw new UserInfoExtraException(1, "姝ゅ井淇″凡琚叾浠栧笎鍙风粦瀹�");
+ }
+ } else if (!wxUnionId.equals(wxUnionIdExist)){
+ throw new UserInfoExtraException(1, "缁戝畾寰俊涓庢縺娲诲井淇′笉涓�鑷�");
+ }
+
+ // 閭�璇蜂汉ID
+ Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
+ if (inviterId == null) {
+ throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
+ }
+
+ UserInfo inviter = userInfoService.selectByPKey(inviterId);
+ if (inviter == null) {
+ throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
+ }
+ return inviter;
+ }
}
--
Gitblit v1.8.0