From f7fc64d5ed3d19e131bc84398ae7e801ff30341e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 九月 2019 15:28:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 500 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 462 insertions(+), 38 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 ec535c2..e4a2e53 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.util.ArrayList;
+import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -12,27 +13,51 @@
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Component;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.tencentcloud.COSManager;
import org.yeshi.utils.tencentcloud.entity.COSInitParams;
+import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.order.HongBaoOrder;
+import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.push.PushQueueRecord;
+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.TaoBaoWeiQuanException;
+import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
+import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;
+import com.yeshi.fanli.service.inter.jd.JDOrderService;
import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
import com.yeshi.fanli.service.inter.lable.LabelService;
-import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
+import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.pdd.PDDOrderService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+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.taobao.TaoKeApiUtil;
/**
* 绯荤粺鍒濆鍖�
@@ -65,7 +90,7 @@
private OrderProcessService orderProcessService;
@Resource
- private QualityFactoryService qualityFactoryService;
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Resource
private UserSystemCouponService userSystemCouponService;
@@ -75,6 +100,33 @@
@Resource
private TaoBaoOrderService taoBaoOrderService;
+
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
+
+ @Resource
+ private JDOrderService jdOrderService;
+
+ @Resource
+ private PDDOrderService pddOrderService;
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+ @Resource
+ private CommonOrderService commonOrderService;
+
+ @Resource
+ private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private IntegralTaskRecordService integralTaskRecordService;
private static boolean isInited = false;
@@ -98,16 +150,22 @@
if (Constant.IS_TASK) {
doExtractResult();// 澶勭悊鎻愮幇缁撴灉
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
+ doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
- doUpdateGoodsJob();
- } else if (!Constant.IS_TEST) {
- initScheduler();// 鍚姩瀹氭椂浠诲姟
- //
+ doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
+ initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
+ doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
+ doJDOrderJob();// 浜笢璁㈠崟澶勭悊
+ doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
+ doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
+ doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
+ doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
}
+
}
/**
@@ -169,6 +227,46 @@
*/
public void doTaoBaoOrders() {
// 鍚屾椂寮�鍚�3涓嚎绋嬪鐞�
+ for (int i = 0; i < 3; i++) {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+
+ // 鍙�16涓鍗�
+ List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
+ if (orderIds != null) {
+ for (String orderId : orderIds) {
+ if (NumberUtil.isNumeric(orderId.trim())) {
+ Map<String, List<TaoBaoOrder>> map = new HashMap<>();
+ List<TaoBaoOrder> orderList = taoBaoOrderService
+ .getTaoBaoOrderByOrderId(orderId);
+ map.put(orderId, orderList);
+ LogHelper.orderInfo("寮�濮嬪鐞嗚鍗�:" + orderId);
+ orderProcessService.processOrder(map);
+ LogHelper.orderInfo("缁撴潫澶勭悊璁㈠崟:" + orderId);
+ }
+ }
+ }
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+
+ }
+ }
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * 鍒氬垰浜х敓鐨勮鍗�
+ */
+ public void doTaoBaoNewOrders() {
+ // 鍚屾椂寮�鍚�3涓嚎绋嬪鐞�
for (int i = 0; i < 1; i++) {
executor.execute(new Runnable() {
@Override
@@ -176,16 +274,19 @@
while (true) {
try {
// 鍙�16涓鍗�
- Map<String, List<TaoBaoOrder>> map = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);
- if (map != null) {
- // 浠庡簱閲岄潰鏌ヨ
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String orderId = its.next();
+ List<String> orderIds = CMQManager.getInstance().consumeTaoBaoNewOrderMsg(16);
+ Map<String, List<TaoBaoOrder>> map = new HashMap<>();
+ if (orderIds != null) {
+ for (String orderId : orderIds) {
List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
map.put(orderId, orderList);
+
+ LogHelper.orderInfo("鏂拌鍗�-寮�濮嬪鐞嗚鍗�:" + orderId);
+ long startTime = System.currentTimeMillis();
+ orderProcessService.processOrder(map);
+ LogHelper.orderInfo("鏂拌鍗�-缁撴潫澶勭悊璁㈠崟:" + orderId + "- 澶勭悊鏃堕棿:"
+ + (System.currentTimeMillis() - startTime));
}
- orderProcessService.processOrder(map);
}
} catch (Exception e) {
try {
@@ -215,7 +316,15 @@
while (its.hasNext()) {
String handler = its.next();
try {
- orderProcessService.fanli(map.get(handler));
+ HongBaoV2 hongbao = map.get(handler);
+ if (hongbao != null) {
+ String key = "hongbao-fanli-" + hongbao.getId();
+ if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ // 澶勭悊涔嬪悗瑕侀殧2灏忔椂鍐嶆杩涜澶勭悊
+ redisManager.cacheCommonString(key, "1", 60 * 60 * 2);
+ orderProcessService.fanli(map.get(handler));
+ }
+ }
CMQManager.getInstance().deleteFanLiMsgNew(handler);
} catch (TaoBaoWeiQuanException e) {
try {
@@ -352,7 +461,7 @@
}
}
} catch (Exception e) {
-
+ LogHelper.errorDetailInfo(e);
}
}
}
@@ -367,43 +476,28 @@
boutiqueAutoRuleService.startScheduler();
}
+ /**
+ * 鏇存柊绮鹃�夊簱鍟嗗搧
+ */
public void doUpdateGoodsJob() {
-
- // 閲囩敤4涓嚎绋嬪仛鏇存柊
for (int i = 0; i < 1; i++)
executor.execute(new Runnable() {
@Override
public void run() {
-
while (true) {
try {
-
Map<String, Long> map = CMQManager.getInstance().consumeNeedUpdateTaoBaoGoodsIdMsg(16);
-
if (map != null) {
-
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
-
String key = its.next();
- try {
- Long goodsId = map.get(key);
- List<Long> list = new ArrayList<>();
- list.add(goodsId);
- qualityFactoryService.updateGoodsFactory(list);
- CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(key);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
+ taoBaoGoodsUpdateService.updateByTaoKeGoodsDetail(Long.parseLong(key));
+ CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(key);
}
}
} catch (Exception e) {
+ e.printStackTrace();
LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
-
}
}
}
@@ -469,4 +563,334 @@
});
}
+
+ /**
+ * 鐢ㄦ埛鍊熻捶澶勭悊
+ */
+ public void doUserMoneyDebtJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, UserMoneyChangeDTO> map = UserMoneyChangeCMQManager.getInstance()
+ .consumeQueueMsg(UserMoneyChangeCMQManager.QUEUE_DEBT, 16);
+ if (map != null) {
+
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ UserMoneyChangeDTO dto = map.get(key);
+ if (dto != null && dto.getChangeMoney().compareTo(new BigDecimal(0)) > 0) {
+ userMoneyDebtService.repayDebt(dto.getUid());
+ }
+ UserMoneyChangeCMQManager.getInstance()
+ .deleteQueueMsg(UserMoneyChangeCMQManager.QUEUE_DEBT, key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("杩樻鍑洪敊:" + e.getMessage());
+ }
+ }
+ }
+ });
+ }
+
+ public void doJDOrderJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, String> map = JDOrderCMQManager.getInstance().consumeJDOrder(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ String orderId = map.get(key);
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ JDOrder order = jdOrderService.selectDetailByOrderId(Long.parseLong(orderId));
+ orderProcessService.processJDOrder(order);
+ }
+ JDOrderCMQManager.getInstance().deleteJDOrder(key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("鎷煎澶氳鍗曞嚭閿�:" + e.getMessage());
+
+ }
+ }
+ }
+ });
+
+ }
+
+ public void doPDDOrderJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ try {
+ Map<String, String> map = PDDOrderCMQManager.getInstance().consumePDDOrder(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ String orderId = map.get(key);
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ List<PDDOrder> orderList = pddOrderService.selectByOrderSn(orderId);
+ if (orderList != null)
+ for (PDDOrder order : orderList)
+ orderProcessService.processPDDOrder(order);
+ }
+ PDDOrderCMQManager.getInstance().deletePDDOrder(key);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
+ } catch (Exception e) {
+ LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
+ }
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
+ */
+ public void doImportantTaoBaoGoodsUpdateJob() {
+ // 寮�鍚�2涓嚎绋嬪仛鏇存柊
+ for (int i = 0; i < 2; i++)
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ Map<String, Long> map = CMQManager.getInstance().consumeTBImpGoodsUpdateMsg(16);
+ if (map != null) {
+ Iterator<String> its = map.keySet().iterator();
+ while (its.hasNext()) {
+ String key = its.next();
+ try {
+ long startTime = System.currentTimeMillis();
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(map.get(key));
+ // 鏇存柊涓�鏉℃暟鎹渶瑕佺殑鏃堕棿
+ taoBaoGoodsUpdateService.updateTaoBaoGoods(goods);
+ long time = System.currentTimeMillis() - startTime;
+ LogHelper.test("娣樺疂閲嶈鍟嗗搧搴撴洿鏂版椂闂�:" + time);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+ CMQManager.getInstance().deleteTBImpGoodsUpdateMsg(key);
+ }
+ }
+ }
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 绾㈠寘鍒拌处鍚庣殑閲戝竵鑾峰彇
+ */
+ public void doHongBaoRecieveIntegralGetJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ 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) {
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘
+ integralGetService.addRebateOrder(hongBaoV2.getUserInfo().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());
+ }
+ }
+ HongBaoRecieveCMQManager.getInstance()
+ .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ } finally {
+
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
+ private boolean isFirstValidOrder(String orderId, int sourceType, Long uid) {
+ CommonOrder commonOrder = commonOrderService.selectLatestValidByUid(uid);
+ if (commonOrder != null && commonOrder.getOrderNo().equalsIgnoreCase(orderId)
+ && sourceType == commonOrder.getSourceType())
+ return true;
+ else
+ return false;
+ }
+
+ // 涓嬪崟鑾峰彇閲戝竵浠诲姟
+ public void doPlaceOrderIntegralJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ 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())) {// 鏈夋晥鐨勯鍗�
+ 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);
+ }
+ }
+
+ }
+ }
+ }
+ });
+ }
+
+ // 鎶栭煶骞垮憡鐩戞帶
+ public void doPlaceOrderAdJob() {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ while (true) {
+ Map<String, Order> map = PlaceOrderCMQManager.getInstance()
+ .consumeQueueMsg(PlaceOrderCMQManager.QUEUE_AD, 16);
+ if (map != null) {
+ // 鏄惁鏄鍗�
+ for (Iterator<String> its = map.keySet().iterator(); its.hasNext();) {
+ String key = its.next();
+ Order order = map.get(key);
+ if (isFirstValidOrder(order.getOrderId(), order.getOrderType(),
+ order.getUserInfo().getId())) {// 鏈夋晥鐨勯鍗�
+ // TODO 鎶栭煶鐨勬暟鎹洖璋�
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+
}
--
Gitblit v1.8.0