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 | 557 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 405 insertions(+), 152 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 a9569b2..ec07767 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.util;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -19,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,6 +37,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
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;
@@ -56,14 +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.ThreeSaleCMQManager;
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;
/**
@@ -138,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) {
@@ -162,10 +173,10 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
- doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+
+ doOrderShareFanLi();
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
- doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
@@ -173,10 +184,14 @@
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
- doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
- doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
- }
+ // doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
+ // doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
+ doOrderTeamIncomePreFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+ doDividentsPreJob();
+ doOrderTeamIncomeFanLi();
+ doDividentsJob();
+ }
}
/**
@@ -329,7 +344,8 @@
try {
HongBaoV2 hongbao = map.get(handler);
if (hongbao != null) {
- String key = "hongbao-fanli-" + hongbao.getId();
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.hongBaoFanLi,
+ hongbao.getId() + "");
if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
// 澶勭悊涔嬪悗瑕侀殧2灏忔椂鍐嶆杩涜澶勭悊
redisManager.cacheCommonString(key, "1", 60 * 60 * 2);
@@ -362,29 +378,94 @@
}
/**
- * 澶勭悊娣樺疂鎻愭垚璁㈠崟杩斿埄
+ * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
*/
- 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) {
+ UidDateDTO dto = map.get(handler);
+ orderProcessService.fanliPreInvaite(dto.getUid(), dto.getDate());
+ TeamOrderCMQManager.getInstance().deleteTeamIncomePreMsg(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 doOrderTeamIncomeFanLi() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ 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 {
+ UidDateDTO dto = map.get(handler);
+ teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());
+ TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
+ } catch (Exception e) {
+ try {
+ 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(), "");
@@ -513,66 +594,6 @@
}
}
});
- }
-
- /**
- * 閭�璇峰叧绯诲彉鍖栧悗鍒哥殑鏇存柊
- */
- public void doThreeSaleUserCouponJob() {
-
- // 閲囩敤2涓嚎绋嬪仛鏇存柊
- for (int i = 0; i < 2; i++)
- executor.execute(new Runnable() {
- @Override
- public void run() {
-
- while (true) {
- try {
- Map<String, ThreeSale> map = ThreeSaleCMQManager.getInstance()
- .consumeQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, 16);
- if (map != null) {
-
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String key = its.next();
- try {
- ThreeSale threeSale = map.get(key);
- if (threeSale != null)
- threeSale = threeSaleSerivce.selectByPrimaryKey(threeSale.getId());
- if (threeSale != null) {
- if (threeSale.getState() != null && threeSale.getState() == true) {
- // 閭�璇锋垚鍔� - 鍒告縺娲荤敓鏁�
- LogHelper.test("doThreeSaleUserCouponJob-" + threeSale.getId());
-
- Long bossId = threeSale.getBoss().getId();
- // 涓嬬骇鏄电О
-
- String workerNickName = userInfoService
- .selectByPKey(threeSale.getWorker().getId()).getNickName();
-
- userSystemCouponService.activatedWelfareFreeCoupon(bossId,
- workerNickName);
- }
- }
- ThreeSaleCMQManager.getInstance()
- .deleteQueueMsg(ThreeSaleCMQManager.QUEUE_USER_COUPON, key);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- }
- }
- } catch (Exception e) {
- LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
-
- }
- }
- }
- });
-
}
/**
@@ -722,7 +743,6 @@
}
}
});
-
}
/**
@@ -744,20 +764,146 @@
HongBaoV2 hongBaoV2 = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
&& hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ // 鍒拌处閫侀噾甯�
+ fanliGetIntegral(hongBaoV2);
+ HongBaoRecieveCMQManager.getInstance()
+ .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
+
+ // 杩斿埄涓嶈冻0.01鍏冮�侀噾甯�
if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘
- integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId());
+ // 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_ZIGOU);
+ HongBaoV2 firstHongBao = hongBaoV2Service.getFirstValidHongBaoByTypeAndUid(
+ typeList, hongBaoV2.getUserInfo().getId());
+ if (firstHongBao != null
+ && firstHongBao.getId().longValue() == hongBaoV2.getId()) {// 鑷喘棣栧崟鍒拌处
+ // 鏌ヨ涓嬬骇绾㈠寘
+ BigDecimal firstLevelMoney = new BigDecimal(0);
+ BigDecimal secondLevelMoney = new BigDecimal(0);
+ // 鑾峰彇鏀瑰崟涓嬮潰鐨勭孩鍖�
+ List<HongBaoV2> hongBaoList = new ArrayList<>();
+ HongBaoOrder hongBaoOrder = hongBaoOrderService
+ .selectDetailByHongBaoId(hongBaoV2.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {// 璁＄畻鏀硅鍗曞彿涓嬮潰鐨勬墍鏈夎繑鍒╅噾棰�
+ CommonOrder commonOrder = hongBaoOrder.getCommonOrder();
+ List<CommonOrder> list = commonOrderService.listBySourceTypeAndOrderId(
+ commonOrder.getSourceType(), commonOrder.getOrderNo());
+ for (CommonOrder co : list) {
+ HongBaoOrder hbo = hongBaoOrderService
+ .selectDetailByCommonOrderId(co.getId());
+ if (hbo != null && hbo.getHongBaoV2() != null)
+ hongBaoList.add(hbo.getHongBaoV2());
+ }
+ }
+
+ for (HongBaoV2 hb : hongBaoList) {
+ List<HongBaoV2> children = hongBaoV2Service
+ .listChildrenById(hb.getId());
+ if (children != null)
+ for (HongBaoV2 child : children)
+ if (child.getType() == HongBaoV2.TYPE_YIJI) {
+ firstLevelMoney = firstLevelMoney.add(child.getMoney());
+ } else if (child.getType() == HongBaoV2.TYPE_ERJI) {
+ secondLevelMoney = secondLevelMoney.add(child.getMoney());
+ }
+ }
+
+ // 鏌ヨ涓嬬骇鐨勭敓鏁堟椂闂�
+ ThreeSale threeSale = threeSaleSerivce.selectLatestByWorkerIdAndState(
+ hongBaoV2.getUserInfo().getId(), ThreeSale.STATE_SUCCESS);
+ if (threeSale != null && threeSale.getSucceedTime() != null && threeSale
+ .getSucceedTime() < hongBaoV2.getCreateTime().getTime()) {// 閭�璇锋垚鍔熺殑鏃堕棿鏄惁鍦ㄤ笅鍗曠殑鏃堕棿涔嬪墠
+ // 鎴愬姛鏃堕棿瑕佸ぇ浜�20190910鏃ユ墠寮�濮嬮�侀噾甯�
+ if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
+ "yyyyMMdd")) {
+ if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 涓�绾ц繑鍒╁皬浜�0.01
+ integralTaskRecordService.firstRebateOrderRewardBoss(
+ threeSale.getBoss().getId(),
+ hongBaoV2.getUserInfo().getId(), null);
+ LogHelper.test("鑷喘-涓�绾х敤鎴�-" + threeSale.getBoss().getId()
+ + "-hongBaoId:" + hongBaoV2.getId());
+ }
+ }
+ }
+ // 鏌ヨ涓嬩笅绾х敓鏁堟椂闂�
+ if (threeSale != null) {
+ threeSale = threeSaleSerivce.selectLatestByWorkerIdAndState(
+ threeSale.getBoss().getId(), ThreeSale.STATE_SUCCESS);
+ if (threeSale != null && threeSale.getSucceedTime() != null && threeSale
+ .getSucceedTime() < hongBaoV2.getCreateTime().getTime()) {// 閭�璇锋垚鍔熺殑鏃堕棿鏄惁鍦ㄤ笅鍗曠殑鏃堕棿涔嬪墠
+ // 鎴愬姛鏃堕棿瑕佸ぇ浜�20190910鏃ユ墠寮�濮嬮�侀噾甯�
+ if (threeSale.getSucceedTime() > TimeUtil
+ .convertToTimeTemp("20190901", "yyyyMMdd")) {
+ if (secondLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 浜岀骇杩斿埄灏忎簬0.01
+ integralTaskRecordService.firstRebateOrderRewardBossSuper(
+ threeSale.getBoss().getId(),
+ hongBaoV2.getUserInfo().getId(), null);
+ LogHelper.test("鑷喘-浜岀骇鐢ㄦ埛-" + threeSale.getBoss().getId()
+ + "-hongBaoId:" + hongBaoV2.getId());
+ }
+ }
+ }
+ }
+ }
} else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璧�
- integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId());
- } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI
- || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾ч個璇疯禋
- integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId());
- } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI
- || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇閭�璇疯禋
- integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId());
+ // 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_SHARE_GOODS);
+ HongBaoV2 firstHongBao = hongBaoV2Service.getFirstValidHongBaoByTypeAndUid(
+ typeList, hongBaoV2.getUserInfo().getId());
+ if (firstHongBao != null
+ && firstHongBao.getId().longValue() == hongBaoV2.getId()) // 鍒嗕韩棣栫瑪鍒拌处
+ {
+
+ // 鏌ヨ涓嬬骇绾㈠寘
+ BigDecimal firstLevelMoney = new BigDecimal(0);
+ // 鑾峰彇鏀瑰崟涓嬮潰鐨勭孩鍖�
+ List<HongBaoV2> hongBaoList = new ArrayList<>();
+ HongBaoOrder hongBaoOrder = hongBaoOrderService
+ .selectDetailByHongBaoId(hongBaoV2.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {// 璁＄畻鏀硅鍗曞彿涓嬮潰鐨勬墍鏈夎繑鍒╅噾棰�
+ CommonOrder commonOrder = hongBaoOrder.getCommonOrder();
+ List<CommonOrder> list = commonOrderService.listBySourceTypeAndOrderId(
+ commonOrder.getSourceType(), commonOrder.getOrderNo());
+ for (CommonOrder co : list) {
+ HongBaoOrder hbo = hongBaoOrderService
+ .selectDetailByCommonOrderId(co.getId());
+ if (hbo != null && hbo.getHongBaoV2() != null)
+ hongBaoList.add(hbo.getHongBaoV2());
+ }
+ }
+
+ for (HongBaoV2 hb : hongBaoList) {
+ List<HongBaoV2> children = hongBaoV2Service
+ .listChildrenById(hb.getId());
+ if (children != null)
+ for (HongBaoV2 child : children)
+ if (child.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
+ firstLevelMoney = firstLevelMoney.add(child.getMoney());
+ }
+ }
+
+ ThreeSale threeSale = threeSaleSerivce.selectLatestByWorkerIdAndState(
+ hongBaoV2.getUserInfo().getId(), ThreeSale.STATE_SUCCESS);
+ if (threeSale != null && threeSale.getSucceedTime() != null && threeSale
+ .getSucceedTime() < hongBaoV2.getCreateTime().getTime()) {// 閭�璇锋垚鍔熺殑鏃堕棿鏄惁鍦ㄤ笅鍗曠殑鏃堕棿涔嬪墠
+ // 鎴愬姛鏃堕棿瑕佸ぇ浜�20190910鏃ユ墠寮�濮嬮�侀噾甯�
+ if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
+ "yyyyMMdd")) {
+ if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 涓�绾ц繑鍒╁皬浜�0.01
+ integralTaskRecordService.firstSharerOrderRewardBoss(
+ threeSale.getBoss().getId(),
+ hongBaoV2.getUserInfo().getId(), null);
+ LogHelper.test("鍒嗕韩-涓�绾х敤鎴�-" + threeSale.getBoss().getId()
+ + "-hongBaoId:" + hongBaoV2.getId());
+ }
+ }
+ }
+ }
}
}
- HongBaoRecieveCMQManager.getInstance()
- .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
+
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -772,6 +918,35 @@
}
}
});
+ }
+
+ private void fanliGetIntegral(HongBaoV2 hongBaoV2) {
+ if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
+ && hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ // 鏌ヨ瀵瑰簲鐨勮鍗曞彿
+ Long mainHongBaoId = hongBaoV2.getId();
+ if (hongBaoV2.getParent() != null && hongBaoV2.getParent().getId() != null)
+ mainHongBaoId = hongBaoV2.getParent().getId();
+
+ HongBaoOrder hongbaoOrder = hongBaoOrderService.selectDetailByHongBaoId(mainHongBaoId);
+ if (hongbaoOrder == null || hongbaoOrder.getCommonOrder() == null)
+ return;
+ CommonOrder commonOrder = hongbaoOrder.getCommonOrder();
+
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘璁㈠崟
+ integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璁㈠崟
+ integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾ч個璇�
+ integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇閭�璇�
+ integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
+ }
+ }
}
private boolean isFirstValidOrder(String orderId, int sourceType, Long uid) {
@@ -792,78 +967,82 @@
Map<String, Order> map = PlaceOrderCMQManager.getInstance()
.consumeQueueMsg(PlaceOrderCMQManager.QUEUE_INTEGRAL, 16);
if (map != null) {
- // 鏄惁鏄鍗�
+
for (Iterator<String> its = map.keySet().iterator(); its.hasNext();) {
try {
String key = its.next();
Order order = map.get(key);
- // 缁熻璁㈠崟涓嬬殑鐢ㄦ埛鎵�鑾峰緱鐨勮繑鍒╅噾棰�
- List<CommonOrder> list = commonOrderService
- .listBySourceTypeAndOrderId(order.getOrderType(), order.getOrderId());
- Map<Long, BigDecimal> hongBaoMoney = new HashMap<>();
- if (list != null)
- for (CommonOrder commonOrder : list) {
- HongBaoOrder hongBaoOrder = hongBaoOrderService
- .selectDetailByCommonOrderId(commonOrder.getId());
- if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {
- Long mainUid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();
- if (hongBaoMoney.get(mainUid) == null)
- hongBaoMoney.put(mainUid, new BigDecimal(0));
- hongBaoMoney.put(mainUid, hongBaoMoney.get(mainUid)
- .add(hongBaoOrder.getHongBaoV2().getMoney()));
- // 鏌ヨ涓婄骇
- List<HongBaoV2> children = hongBaoV2Service
- .listChildrenById(hongBaoOrder.getHongBaoV2().getId());
- if (children != null) {
- for (HongBaoV2 hongBao : children) {
- Long uid = hongBao.getUserInfo().getId();
- if (hongBaoMoney.get(uid) == null)
- hongBaoMoney.put(uid, new BigDecimal(0));
- hongBaoMoney.put(uid,
- hongBaoMoney.get(uid).add(hongBao.getMoney()));
+ // 鏄惁鏄鍗�
+ if (isFirstValidOrder(order.getOrderId(), order.getOrderType(),
+ order.getUserInfo().getId())) {
+ // 缁熻璁㈠崟涓嬬殑鐢ㄦ埛鎵�鑾峰緱鐨勮繑鍒╅噾棰�
+ List<CommonOrder> list = commonOrderService
+ .listBySourceTypeAndOrderId(order.getOrderType(), order.getOrderId());
+ Map<Long, BigDecimal> hongBaoMoney = new HashMap<>();
+ if (list != null)
+ for (CommonOrder commonOrder : list) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderService
+ .selectDetailByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {
+ Long mainUid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();
+ if (hongBaoMoney.get(mainUid) == null)
+ hongBaoMoney.put(mainUid, new BigDecimal(0));
+ hongBaoMoney.put(mainUid, hongBaoMoney.get(mainUid)
+ .add(hongBaoOrder.getHongBaoV2().getMoney()));
+ // 鏌ヨ涓婄骇
+ List<HongBaoV2> children = hongBaoV2Service
+ .listChildrenById(hongBaoOrder.getHongBaoV2().getId());
+ if (children != null) {
+ for (HongBaoV2 hongBao : children) {
+ Long uid = hongBao.getUserInfo().getId();
+ if (hongBaoMoney.get(uid) == null)
+ hongBaoMoney.put(uid, new BigDecimal(0));
+ hongBaoMoney.put(uid,
+ hongBaoMoney.get(uid).add(hongBao.getMoney()));
+ }
}
}
}
- }
- if (isFirstValidOrder(order.getOrderId(), order.getOrderType(),
- order.getUserInfo().getId())) {// 鏈夋晥鐨勯鍗�
- if (hongBaoMoney.get(order.getUserInfo().getId()) == null || hongBaoMoney
- .get(order.getUserInfo().getId()).compareTo(new BigDecimal("0")) <= 0) {
- // 鍒嗕韩濂栭噾鏄�0
- integralTaskRecordService.firstShareOrderReward(order.getUserInfo().getId(),
- null);
- }
-
- // 鑾峰彇涓婁袱绾ф暟鎹�
- UserInfo boss = threeSaleSerivce.getBoss(order.getUserInfo().getId());
- if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
- if (hongBaoMoney.get(boss.getId()) == null
- || hongBaoMoney.get(boss.getId()).compareTo(new BigDecimal("0")) <= 0) {
- // 琛ュ伩閲戝竵
- integralTaskRecordService.firstSharerOrderRewardBoss(boss.getId(),
- order.getUserInfo().getId(), null);
+ if (isFirstValidOrder(order.getOrderId(), order.getOrderType(),
+ order.getUserInfo().getId())) {// 鏈夋晥鐨勯鍗�
+ if (hongBaoMoney.get(order.getUserInfo().getId()) == null || hongBaoMoney
+ .get(order.getUserInfo().getId()).compareTo(new BigDecimal("0")) <= 0) {
+ // 鍒嗕韩濂栭噾鏄�0
+ integralTaskRecordService.firstShareOrderReward(order.getUserInfo().getId(),
+ null);
}
- }
- } else {// 鑷喘璁㈠崟
- UserInfo boss = threeSaleSerivce.getBoss(order.getUserInfo().getId());
- if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
- if (hongBaoMoney.get(boss.getId()) == null
- || hongBaoMoney.get(boss.getId()).compareTo(new BigDecimal("0")) <= 0) {
- // 琛ュ伩閲戝竵1绾�
- integralTaskRecordService.firstRebateOrderRewardBoss(boss.getId(),
- order.getUserInfo().getId(), null);
+ // 鑾峰彇涓婁袱绾ф暟鎹�
+ UserInfo boss = threeSaleSerivce.getBoss(order.getUserInfo().getId());
+ if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
+ if (hongBaoMoney.get(boss.getId()) == null || hongBaoMoney.get(boss.getId())
+ .compareTo(new BigDecimal("0")) <= 0) {
+ // 琛ュ伩閲戝竵
+ integralTaskRecordService.firstSharerOrderRewardBoss(boss.getId(),
+ order.getUserInfo().getId(), null);
+ }
}
- }
- boss = threeSaleSerivce.getBoss(boss.getId());
- if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
- if (hongBaoMoney.get(boss.getId()) == null
- || hongBaoMoney.get(boss.getId()).compareTo(new BigDecimal("0")) <= 0) {
- // 琛ュ伩閲戝竵2绾�
- integralTaskRecordService.firstRebateOrderRewardBossSuper(boss.getId(),
- order.getUserInfo().getId(), null);
+ } else {// 鑷喘璁㈠崟
+ UserInfo boss = threeSaleSerivce.getBoss(order.getUserInfo().getId());
+ if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
+ if (hongBaoMoney.get(boss.getId()) == null || hongBaoMoney.get(boss.getId())
+ .compareTo(new BigDecimal("0")) <= 0) {
+ // 琛ュ伩閲戝竵1绾�
+ integralTaskRecordService.firstRebateOrderRewardBoss(boss.getId(),
+ order.getUserInfo().getId(), null);
+ }
+
+ boss = threeSaleSerivce.getBoss(boss.getId());
+ if (boss != null) {// 鍒ゆ柇涓婄骇鐨勭孩鍖�
+ if (hongBaoMoney.get(boss.getId()) == null || hongBaoMoney
+ .get(boss.getId()).compareTo(new BigDecimal("0")) <= 0) {
+ // 琛ュ伩閲戝竵2绾�
+ integralTaskRecordService.firstRebateOrderRewardBossSuper(
+ boss.getId(), order.getUserInfo().getId(), null);
+ }
+ }
}
}
}
@@ -923,9 +1102,9 @@
String key = its.next();
DouYinDeviceActiveQueueDTO active = map.get(key);
if (active.getType() == DouYinDeviceActiveQueueDTO.TYPE_AD) {// 鎶栭煶
- DouYinClickEvent event = douYinClickEventService.selectByAid(active.getAid());
+ DouYinClickEvent event = douYinClickEventService.selectByCallback(active.getCallback());
if (event != null) {
- if (event.getOs() == 0) {
+ if (event.getOs() == 0 && !StringUtil.isNullOrEmpty(event.getUuid())) {
DeviceActive deviceActive = deviceActiveService
.getFirstActiveInfoByImei(event.getUuid());
if (deviceActive != null) {
@@ -948,7 +1127,7 @@
if (active.getPlatform() == 1) {
DeviceActive deviceActive = deviceActiveService
.getFirstActiveInfo(active.getDevice());
- if (deviceActive != null && deviceActive.getImei() != null) {
+ if (deviceActive != null && !StringUtil.isNullOrEmpty(deviceActive.getImei())) {
DouYinClickEvent event = douYinClickEventService
.selectByUuid(deviceActive.getImei());
if (event != null) {// 鍥炶皟
@@ -969,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