From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 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..507d0ce 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
@@ -54,6 +54,7 @@
 import com.yeshi.fanli.service.inter.user.UserInviteRecordService;
 import com.yeshi.fanli.service.inter.user.UserRankService;
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
 import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.FilePathEnum;
@@ -103,6 +104,9 @@
 	@Resource
 	@Lazy
 	private UserActivedRecordService userActivedRecordService;
+	
+	@Resource
+	private UserAccountMsgNotificationService userAccountMsgNotificationService;
 
 	@Resource(name = "producer")
 	private Producer producer;
@@ -356,7 +360,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 +483,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 +609,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 +796,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 +846,11 @@
 		if (inviter == null) {
 			throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
 		}
+		
+		if (inviter.getState() != UserInfo.STATE_NORMAL) {
+			throw new UserInfoExtraException(1, "瀵瑰簲鐨勯個璇峰叧绯讳笉瀛樺湪");
+		}
+		
 		return inviter;
 	}
 
@@ -878,6 +901,9 @@
 							new Date())));
 			producer.send(message);
 		}
+		
+		// 娑堟伅
+		userAccountMsgNotificationService.createChangeInviteCode(uid, extra.getInviteCode(), inviteCodeVip);
 	}
 
 	@Override

--
Gitblit v1.8.0