From beef9055e75ec66abd95d642861e4aab74932a95 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 26 五月 2020 10:38:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 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..c4095e6 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,12 +23,14 @@ 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; @@ -73,6 +75,11 @@ @Lazy @Resource private IntegralGetService integralGetService; + + @Lazy + @Resource + private TeamFansInfoService teamFansInfoService; + @Resource(name = "taskExecutor") private TaskExecutor executor; @@ -426,10 +433,14 @@ */ @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); + message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 5000); producer.send(message); } @@ -439,9 +450,10 @@ try { // 閭�璇烽噾甯� integralGetService.addInviteLevelOne(bossId, workerId); } catch (Exception e) { - e.printStackTrace(); + LogHelper.error(e); } - + + // 閭�璇锋垚鍔熸秷鎭� try { // 鐩存帴绮変笣閭�璇锋垚鍔� UserInfo invitee = userInfoService.selectByPKey(workerId); @@ -456,7 +468,7 @@ boss.getNickName(), invitee.getNickName(), invitee.getPortrait(), new Date()); } } catch (Exception e) { - e.printStackTrace(); + LogHelper.error(e); } } }); -- Gitblit v1.8.0