From 4ea48ee6d71a4877aa2644ecf3c4758e26a91149 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 14:56:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 147 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 0 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 1879829..e4a2e53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -20,8 +20,12 @@
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;
@@ -32,10 +36,13 @@
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.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;
@@ -47,6 +54,7 @@
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;
@@ -111,6 +119,15 @@
@Resource
private IntegralGetService integralGetService;
+ @Resource
+ private CommonOrderService commonOrderService;
+
+ @Resource
+ private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private IntegralTaskRecordService integralTaskRecordService;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -146,6 +163,7 @@
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
+ doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
}
}
@@ -743,7 +761,136 @@
}
}
});
+ }
+ 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