From 26f7accb815f55f18f8eedfca4324700a96884ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 八月 2020 18:23:49 +0800
Subject: [PATCH] 资金验证优化
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 638 +++++++++++++++++++++++++++++----------------------------
1 files changed, 320 insertions(+), 318 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 0b5da2f..7d426a4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -801,169 +801,169 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- Map<String, Long> map = HongBaoRecieveCMQManager.getInstance()
- .consumeQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, 16);
- if (map != null) {
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String key = its.next();
- Long hongBaoId = map.get(key);
- try {
- 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);
+ Map<String, Long> map = HongBaoRecieveCMQManager.getInstance()
+ .consumeQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, 16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ Long hongBaoId = map.get(key);
+ try {
+ 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) {// 鑷喘
- // 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
- 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());
- }
+ // 杩斿埄涓嶈冻0.01鍏冮�侀噾甯�
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘
+ // 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
+ 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());
+ 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());
}
- }
- }
- // 鏌ヨ涓嬩笅绾х敓鏁堟椂闂�
- 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());
- }
- }
+ }
+
+ // 鏌ヨ涓嬬骇鐨勭敓鏁堟椂闂�
+ 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());
}
}
}
- } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璧�
- // 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
- 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 = 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 (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 涓�绾ц繑鍒╁皬浜�0.01
- integralTaskRecordService.firstSharerOrderRewardBoss(
+ 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()
+ LogHelper.test("鑷喘-浜岀骇鐢ㄦ埛-" + threeSale.getBoss().getId()
+ "-hongBaoId:" + hongBaoV2.getId());
}
}
}
}
}
- }
+ } else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璧�
+ // 鍒ゆ柇鏄惁涓鸿鐢ㄦ埛鐨勯绗旂孩鍖�
+ 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()) // 鍒嗕韩棣栫瑪鍒拌处
+ {
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- } finally {
+ // 鏌ヨ涓嬬骇绾㈠寘
+ 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());
+ }
+ }
+ }
+ }
+ }
}
+
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
}
}
}
+ }
});
}
@@ -1010,97 +1010,97 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- Map<String, Order> map = PlaceOrderCMQManager.getInstance()
- .consumeQueueMsg(PlaceOrderCMQManager.QUEUE_INTEGRAL, 16);
- if (map != null) {
+ 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);
- // 鏄惁鏄鍗�
- 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);
- }
- }
-
- } 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);
+ for (Iterator<String> its = map.keySet().iterator(); its.hasNext(); ) {
+ try {
+ String key = its.next();
+ Order order = map.get(key);
+ // 鏄惁鏄鍗�
+ 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()));
}
}
}
}
- }
- PlaceOrderCMQManager.getInstance().deleteQueueMsg(PlaceOrderCMQManager.QUEUE_INTEGRAL,
- key);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
+ 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);
+ }
+ }
+
+ } 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);
+ }
+ }
+ }
+ }
+ }
+ PlaceOrderCMQManager.getInstance().deleteQueueMsg(PlaceOrderCMQManager.QUEUE_INTEGRAL,
+ key);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
}
+
}
+ }
});
}
@@ -1135,56 +1135,56 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- Map<String, DouYinDeviceActiveQueueDTO> map = DouYinDeviceActiveCMQManager.getInstance()
- .consume(16);
- if (map != null) {
- // 鏄惁鏄鍗�
- for (Iterator<String> its = map.keySet().iterator(); its.hasNext(); ) {
- String key = its.next();
- DouYinDeviceActiveQueueDTO active = map.get(key);
- if (active.getType() == DouYinDeviceActiveQueueDTO.TYPE_AD) {// 鎶栭煶
- DouYinClickEvent event = douYinClickEventService.selectByCallback(active.getCallback());
- if (event != null) {
- if (event.getOs() == 0 && !StringUtil.isNullOrEmpty(event.getUuid())) {
- DeviceActive deviceActive = deviceActiveService
- .getFirstActiveInfoByImei(event.getUuid());
- if (deviceActive != null) {
- if (event != null) {
- if (event.getOs() == 0)
- DouYinAdUtil.activeAndroid(event.getCallback(), event.getImei(),
- deviceActive.getCreateTime().getTime());
- else if (event.getOs() == 1)
- DouYinAdUtil.activeIOS(event.getCallback(), event.getIdfa(),
- deviceActive.getCreateTime().getTime());
- }
- }
- } else {// TODO 澶勭悊IOS
-
- }
- }
-
- } else if (active.getType() == DouYinDeviceActiveQueueDTO.TYPE_DEVICE) {// 璁惧
-
- if (active.getPlatform() == 1) {
+ Map<String, DouYinDeviceActiveQueueDTO> map = DouYinDeviceActiveCMQManager.getInstance()
+ .consume(16);
+ if (map != null) {
+ // 鏄惁鏄鍗�
+ for (Iterator<String> its = map.keySet().iterator(); its.hasNext(); ) {
+ String key = its.next();
+ DouYinDeviceActiveQueueDTO active = map.get(key);
+ if (active.getType() == DouYinDeviceActiveQueueDTO.TYPE_AD) {// 鎶栭煶
+ DouYinClickEvent event = douYinClickEventService.selectByCallback(active.getCallback());
+ if (event != null) {
+ if (event.getOs() == 0 && !StringUtil.isNullOrEmpty(event.getUuid())) {
DeviceActive deviceActive = deviceActiveService
- .getFirstActiveInfo(active.getDevice());
- if (deviceActive != null && !StringUtil.isNullOrEmpty(deviceActive.getImei())) {
- DouYinClickEvent event = douYinClickEventService
- .selectByUuid(deviceActive.getImei());
- if (event != null) {// 鍥炶皟
- if (deviceActive != null)
+ .getFirstActiveInfoByImei(event.getUuid());
+ if (deviceActive != null) {
+ if (event != null) {
+ if (event.getOs() == 0)
DouYinAdUtil.activeAndroid(event.getCallback(), event.getImei(),
+ deviceActive.getCreateTime().getTime());
+ else if (event.getOs() == 1)
+ DouYinAdUtil.activeIOS(event.getCallback(), event.getIdfa(),
deviceActive.getCreateTime().getTime());
}
}
- } else {
- // TODO 鍏煎IOS
+ } else {// TODO 澶勭悊IOS
+
}
}
- DouYinDeviceActiveCMQManager.getInstance().delete(key);
+
+ } else if (active.getType() == DouYinDeviceActiveQueueDTO.TYPE_DEVICE) {// 璁惧
+
+ if (active.getPlatform() == 1) {
+ DeviceActive deviceActive = deviceActiveService
+ .getFirstActiveInfo(active.getDevice());
+ if (deviceActive != null && !StringUtil.isNullOrEmpty(deviceActive.getImei())) {
+ DouYinClickEvent event = douYinClickEventService
+ .selectByUuid(deviceActive.getImei());
+ if (event != null) {// 鍥炶皟
+ if (deviceActive != null)
+ DouYinAdUtil.activeAndroid(event.getCallback(), event.getImei(),
+ deviceActive.getCreateTime().getTime());
+ }
+ }
+ } else {
+ // TODO 鍏煎IOS
+ }
}
+ DouYinDeviceActiveCMQManager.getInstance().delete(key);
}
}
+ }
});
}
@@ -1193,37 +1193,37 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- 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());
+ 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);
- } 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) {
+ } else {
try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
+ LogHelper.errorDetailInfo(e1);
+ } catch (Exception e2) {
+ e2.printStackTrace();
}
- } finally {
-
}
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
}
}
}
+ }
});
}
@@ -1232,26 +1232,26 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- 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);
+ 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 {
- teamEincomeManager.addTeamDividentsTOUserAccount(dto.getDate(), dto.getUid());
- TeamOrderCMQManager.getInstance().deleteTeamDividentsMsg(key);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- } finally {
-
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
}
+ } finally {
+
}
}
+ }
}
});
}
@@ -1262,27 +1262,29 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- Map<String, PushContentDetailDTO> map = PushCMQManager.getInstance().consumeHWPush(16);
- if (map != null) {
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String key = its.next();
- PushContentDetailDTO dto = map.get(key);
- try {
- hwPushService.push(dto);
- PushCMQManager.getInstance().deleteHWPush(key);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- } finally {
+ Map<String, PushContentDetailDTO> map = PushCMQManager.getInstance().consumeHWPush(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ PushContentDetailDTO dto = map.get(key);
+ LogHelper.pushHW("鎺ュ彈鍒版秷鎭細" + new Gson().toJson(dto));
+ try {
+ hwPushService.push(dto);
+ PushCMQManager.getInstance().deleteHWPush(key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
}
+ } finally {
+
}
}
}
+ }
});
}
--
Gitblit v1.8.0