From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 15 六月 2020 16:32:35 +0800 Subject: [PATCH] 好单库转链支持 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 45 insertions(+), 5 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 f5223e2..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; @@ -257,7 +264,7 @@ @Override public JSONObject getMyFirstTeam(long start, int count, Long uid) { - List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid,null); + List<ThreeSale> list = threeSaleMapper.listFirstTeam(start, count, uid, null); if (list == null) { list = new ArrayList<ThreeSale>(); } @@ -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); } } }); @@ -517,7 +529,7 @@ public long countSecondTeam(Long uid) { return threeSaleMapper.countSecondTeam(uid, null); } - + @Override public long countFirstTeam(Long uid, List<Long> listId) { return threeSaleMapper.countFirstTeam(uid, listId); @@ -526,6 +538,16 @@ @Override public long countSecondTeam(Long uid, List<Long> listId) { return threeSaleMapper.countSecondTeam(uid, listId); + } + + @Override + public long countFirstTeamByDate(Long uid, int dayType) { + return threeSaleMapper.countFirstTeamByDate(uid, dayType); + } + + @Override + public long countSecondTeamByDate(Long uid, int dayType) { + return threeSaleMapper.countSecondTeamByDate(uid, dayType); } @Override @@ -584,4 +606,22 @@ return bossUid; } + @Override + public List<ThreeSale> listAll(Date minTime, Date maxTime, int page, int pageSize) { + return threeSaleMapper.listAll(minTime == null ? null : minTime.getTime(), + maxTime == null ? null : maxTime.getTime(), (page - 1) * pageSize, pageSize); + } + + @Override + public long countAll(Date minTime, Date maxTime) { + return threeSaleMapper.countAll(minTime == null ? null : minTime.getTime(), + maxTime == null ? null : maxTime.getTime()); + } + + + @Override + public List<Long> getAllBossId(){ + return threeSaleMapper.getAllBossId(); + } + } -- Gitblit v1.8.0