From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 139 insertions(+), 26 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..ec07767 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.mq.UidDateDTO;
import com.yeshi.fanli.entity.ad.DouYinClickEvent;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -35,8 +36,8 @@
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.exception.order.dividents.TeamDividentsRecordException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
@@ -58,13 +59,16 @@
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.money.TeamEincomeManager;
+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;
-import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
-import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;
-import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;
import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
+import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
@@ -139,6 +143,12 @@
@Resource
private DeviceActiveService deviceActiveService;
+ @Resource
+ private TeamDividentsManager teamDividentsManager;
+
+ @Resource
+ private TeamEincomeManager teamEincomeManager;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -163,8 +173,8 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
- doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
- doOrderTeamRewardFanLi();// 鍥㈤槦濂栧姳鍒拌处
+
+ doOrderShareFanLi();
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
@@ -176,6 +186,11 @@
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
// doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
+ doOrderTeamIncomePreFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+ doDividentsPreJob();
+
+ doOrderTeamIncomeFanLi();
+ doDividentsJob();
}
}
@@ -363,29 +378,24 @@
}
/**
- * 澶勭悊娣樺疂鎻愭垚璁㈠崟杩斿埄
+ * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
*/
- public void doOrderTiChengFanLi() {
+ public void doOrderTeamIncomePreFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
while (true) {
try {
-
- Map<String, Long> map = CMQManager.getInstance().consumeFanLiTiChengMsg(16);
+ Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance()
+ .consumeFanLiTeamIncomePreMsg(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());
+ TeamOrderCMQManager.getInstance().deleteTeamIncomePreMsg(handler);
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
@@ -404,29 +414,58 @@
}
/**
- * 璁㈠崟鍥㈤槦濂栧姳鍒拌处
+ * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
*/
- public void doOrderTeamRewardFanLi() {
+ public void doOrderTeamIncomeFanLi() {
executor.execute(new Runnable() {
@Override
public void run() {
while (true) {
try {
-
- Map<String, Long> map = CMQManager.getInstance().consumeOrderTeamRewardMsg(16);
+ Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance().consumeFanLiTeamIncomeMsg(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) {
+ UidDateDTO dto = map.get(handler);
+ teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());
+ TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
+ } catch (Exception e) {
try {
- LogHelper.errorDetailInfo(e);
+ LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
} catch (Exception e1) {
e1.printStackTrace();
}
+ }
+ }
+ }
+ } catch (Exception e) {
+
+ }
+ }
+ }
+ });
+ }
+
+ /**
+ * 澶勭悊鍒嗕韩璁㈠崟杩斿埄
+ */
+ public void doOrderShareFanLi() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ 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 {
+ 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 +1148,78 @@
});
}
+ // 鍒嗙孩
+ public void doDividentsPreJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance().consumeTeamDividentsPreMsg(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ UidDateDTO dto = map.get(key);
+ try {
+ teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getDate());
+ TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
+ } catch (TeamDividentsRecordException e1) {
+ if (e1.getCode() == TeamDividentsRecordException.CODE_EXIST) {
+ TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
+ } else {
+ try {
+ LogHelper.errorDetailInfo(e1);
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+ }
+ }
+
+ catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
+ // 鍒嗙孩
+ public void doDividentsJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance().consumeTeamDividentsMsg(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ UidDateDTO dto = map.get(key);
+ try {
+ teamEincomeManager.addTeamDividentsTOUserAccount(dto.getDate(), dto.getUid());
+ TeamOrderCMQManager.getInstance().deleteTeamDividentsMsg(key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
}
--
Gitblit v1.8.0