From f862a844ea7e212f8cc0622b858308e2b91dca2e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 16:35:50 +0800
Subject: [PATCH] 后台管理相关Controller注入系统

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
index ff21505..9145d84 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.util.SystemInfoUtil;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,7 @@
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
 import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
@@ -84,8 +86,8 @@
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
 
-	@Resource(name = "producer")
-	private Producer producer;
+	@Resource
+	private RocketMQManager rocketMQManager;
 
 	public UserInfo getBoss(final long uid) {
 		return threeSaleMapper.selectBoss(uid);
@@ -99,7 +101,7 @@
 		if (worker.getId() == null)// 璇ョ敤鎴疯繕涓嶅瓨鍦�
 		{
 			// 淇濆瓨鐢ㄦ埛
-			UserInfo inviteeUser = userInfoService.addUser(worker, Constant.APPID);
+			UserInfo inviteeUser = userInfoService.addUser(worker,worker.getSystem());
 			if (inviteeUser == null)
 				throw new ThreeSaleException(2, "鍒涘缓鐢ㄦ埛澶辫触");
 			// 淇濆瓨鍏崇郴
@@ -433,11 +435,15 @@
 	 */
 	@Transactional
 	private void inviteSuccess(Long workerId, Long bossId) {
+		// 鍚屾绮変笣娑堟伅
+		teamFansInfoService.addFansInfo(workerId, bossId, new Date());
+		
 		if (!Constant.IS_TEST) {
 			UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),
 					UserInviteMQMsg.STATE_SUCCESS);
 			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteSuccess, msg);
-			producer.send(message);
+			message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 5000);
+			rocketMQManager.sendNormalMsg(message,5000L, null);
 		}
 
 		executor.execute(new Runnable() {
@@ -445,13 +451,6 @@
 			public void run() {
 				try { // 閭�璇烽噾甯�
 					integralGetService.addInviteLevelOne(bossId, workerId);
-				} catch (Exception e) {
-					LogHelper.error(e);
-				}
-				
-				// 鍚屾绮変笣娑堟伅
-				try {
-					teamFansInfoService.addFansInfo(workerId, bossId, new Date());
 				} catch (Exception e) {
 					LogHelper.error(e);
 				}

--
Gitblit v1.8.0