From e76b8179de1cd0ea836b0c2bf7278015e71b9e71 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 10:09:26 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 1dc815a..31a5a30 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
@@ -356,7 +356,7 @@
inviteCode = inviteCode.toUpperCase();
// 閭�璇风爜瀵瑰簲鐢ㄦ埛淇℃伅
UserInfo inviter = userInfoService.getUserInfoByInviteCode(inviteCode);
- if (inviter == null)
+ if (inviter == null || inviter.getState() != UserInfo.STATE_NORMAL)
throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
// 缁戝畾鍏崇郴
@@ -479,6 +479,11 @@
Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
if (inviterId == null)
throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
+
+ UserInfo boss = userInfoService.selectByPKey(inviterId);
+ if (boss == null || boss.getState() != UserInfo.STATE_NORMAL) {
+ throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
+ }
// 缁戝畾鍏崇郴
try {
@@ -600,6 +605,11 @@
// 閭�璇蜂汉ID -1.5.3鏂扮増
Long inviterId = userInviteRecordService.getNewestInviterId(wxUnionId);
if (inviterId == null) {
+ throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
+ }
+
+ UserInfo boss = userInfoService.selectByPKey(inviterId);
+ if (boss == null || boss.getState() != UserInfo.STATE_NORMAL) {
throw new UserInfoExtraException(1, "娌℃湁瀵瑰簲鐨勯個璇峰叧绯�");
}
@@ -782,6 +792,10 @@
UserInfo inviter = userInfoService.getUserInfoByInviteCode(inviteCode);
if (inviter == null)
throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
+
+ if (inviter.getState() != UserInfo.STATE_NORMAL) {
+ throw new UserInfoExtraException(1, "涓婄骇閭�璇风爜涓嶅瓨鍦�");
+ }
return inviter;
}
@@ -828,6 +842,11 @@
if (inviter == null) {
throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
}
+
+ if (inviter.getState() != UserInfo.STATE_NORMAL) {
+ throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
+ }
+
return inviter;
}
--
Gitblit v1.8.0