From 2cde53516c1689efab451aef72c1db5e13b825a3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:42:03 +0800
Subject: [PATCH] 团队订单金额消息加入补贴
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 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 5133d26..594df19 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,8 @@
import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;
import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
+import com.yeshi.fanli.dto.mq.UidDateDTO;
+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;
@@ -35,7 +37,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.money.OrderMoneySettleException;
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
@@ -58,6 +59,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;
@@ -139,6 +141,9 @@
@Resource
private DeviceActiveService deviceActiveService;
+ @Resource
+ private TeamDividentsManager teamDividentsManager;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -163,8 +168,8 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
- doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
- doOrderTeamRewardFanLi();// 鍥㈤槦濂栧姳鍒拌处
+ doOrderTeamIncomeFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+ doOrderShareFanLi();
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
@@ -176,6 +181,9 @@
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
// doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
+
+ doDividentsJob();
+
}
}
@@ -363,29 +371,23 @@
}
/**
- * 澶勭悊娣樺疂鎻愭垚璁㈠崟杩斿埄
+ * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
*/
- public void doOrderTiChengFanLi() {
+ public void doOrderTeamIncomeFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
while (true) {
try {
-
- Map<String, Long> map = CMQManager.getInstance().consumeFanLiTiChengMsg(16);
+ Map<String, UidDateDTO> map = CMQManager.getInstance().consumeFanLiTeamIncomeMsg(16);
if (map != null) {
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String handler = its.next();
try {
- orderProcessService.fanliInvaiteAndShare(map.get(handler));
- CMQManager.getInstance().deleteFanLiTiChengMsg(handler);
- } catch (TaoBaoWeiQuanException e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ UidDateDTO dto = map.get(handler);
+ orderProcessService.fanliPreInvaite(dto.getUid(), dto.getDate());
+ CMQManager.getInstance().deleteTeamIncomeMsg(handler);
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
@@ -404,29 +406,23 @@
}
/**
- * 璁㈠崟鍥㈤槦濂栧姳鍒拌处
+ * 澶勭悊鍒嗕韩璁㈠崟杩斿埄
*/
- public void doOrderTeamRewardFanLi() {
+ public void doOrderShareFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
while (true) {
try {
-
- Map<String, Long> map = CMQManager.getInstance().consumeOrderTeamRewardMsg(16);
+ Map<String, UidDateDTO> map = CMQManager.getInstance().consumeFanLiShareMsg(16);
if (map != null) {
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String handler = its.next();
try {
- orderProcessService.fanliOrderTeamReward(map.get(handler));
- CMQManager.getInstance().deleteOrderTeamRewardMsg(handler);
- } catch (OrderMoneySettleException e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ UidDateDTO dto = map.get(handler);
+ orderProcessService.fanliShare(dto.getUid(), dto.getDate());
+ CMQManager.getInstance().deleteFanLiShareMsg(handler);
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
@@ -1109,4 +1105,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.addToTeamEincome(dto.getUid(), dto.getPreGetTime());
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
}
--
Gitblit v1.8.0