From 055fb8d085efd7e120d69aba6c0fbb8db5867553 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 b8c591e..bb9ad2e 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
@@ -23,15 +23,18 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.user.ThreeSaleException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
+import com.yeshi.fanli.service.inter.user.invite.TeamFansInfoService;
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;
@@ -73,12 +76,17 @@
@Lazy
@Resource
private IntegralGetService integralGetService;
+
+ @Lazy
+ @Resource
+ private TeamFansInfoService teamFansInfoService;
+
@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);
@@ -426,11 +434,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() {
@@ -439,9 +451,10 @@
try { // 閭�璇烽噾甯�
integralGetService.addInviteLevelOne(bossId, workerId);
} catch (Exception e) {
- e.printStackTrace();
+ LogHelper.error(e);
}
-
+
+ // 閭�璇锋垚鍔熸秷鎭�
try {
// 鐩存帴绮変笣閭�璇锋垚鍔�
UserInfo invitee = userInfoService.selectByPKey(workerId);
@@ -456,7 +469,7 @@
boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date());
}
} catch (Exception e) {
- e.printStackTrace();
+ LogHelper.error(e);
}
}
});
--
Gitblit v1.8.0