From 1151bde4c247b3801f7ab750c7abcc79a6514e10 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 11 四月 2020 09:21:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java index efc0d44..7aecffa 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java @@ -20,6 +20,7 @@ import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO; import com.yeshi.fanli.dto.money.UserMoneyChangeDTO; +import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO; import com.yeshi.fanli.entity.ad.DouYinClickEvent; import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo; import com.yeshi.fanli.entity.bus.user.HongBaoV2; @@ -57,6 +58,7 @@ import com.yeshi.fanli.service.inter.user.integral.IntegralGetService; import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService; import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce; +import com.yeshi.fanli.service.manger.order.TeamDividentsManager; import com.yeshi.fanli.util.ad.DouYinAdUtil; import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager; import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager; @@ -138,6 +140,9 @@ @Resource private DeviceActiveService deviceActiveService; + @Resource + private TeamDividentsManager teamDividentsManager; + private static boolean isInited = false; public void onApplicationEvent(ContextRefreshedEvent arg0) { @@ -174,6 +179,9 @@ doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔� // doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔� // doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴� + + doDividentsJob(); + } } @@ -1066,4 +1074,34 @@ }); } + // 鍒嗙孩 + public void doDividentsJob() { + executor.execute(new Runnable() { + @Override + public void run() { + while (true) { + Map<String, UserDividentsDayDTO> map = CMQManager.getInstance().consumeTeamDividentsMsg(16); + if (map != null) { + Iterator<String> its = map.keySet().iterator(); + while (its.hasNext()) { + String key = its.next(); + UserDividentsDayDTO dto = map.get(key); + try { + teamDividentsManager.addDividents(dto.getUid(), dto.getDay()); + } catch (Exception e) { + try { + LogHelper.errorDetailInfo(e); + } catch (Exception e1) { + e1.printStackTrace(); + } + } finally { + + } + } + } + } + } + }); + } + } -- Gitblit v1.8.0