From c76ad0e79b95c0bceed8a0234211f2c7f0168b14 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 16:53:12 +0800
Subject: [PATCH] 推广红包-不在收回
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 16 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 041ece9..11e7042 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.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -12,6 +13,7 @@
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;
@@ -27,10 +29,10 @@
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
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.OrderProcessService;
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;
@@ -69,7 +71,7 @@
private OrderProcessService orderProcessService;
@Resource
- private QualityFactoryService qualityFactoryService;
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Resource
private UserSystemCouponService userSystemCouponService;
@@ -108,15 +110,15 @@
if (Constant.IS_TASK) {
doExtractResult();// 澶勭悊鎻愮幇缁撴灉
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
+ doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
- doUpdateGoodsJob();
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
- } else if (!Constant.IS_TEST) {
- initScheduler();// 鍚姩瀹氭椂浠诲姟
+ initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
+ doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
}
}
@@ -186,16 +188,58 @@
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().consumeTaoBaoOrderMsg(16);
+ Map<String, List<TaoBaoOrder>> map = new HashMap<>();
+ if (orderIds != null) {
+ for (String orderId : orderIds) {
+ if (NumberUtil.isNumeric(orderId.trim())) {
+ 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
+ public void run() {
+ while (true) {
+ try {
+ // 鍙�16涓鍗�
+ 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 {
@@ -370,7 +414,7 @@
}
}
} catch (Exception e) {
-
+ LogHelper.errorDetailInfo(e);
}
}
}
@@ -385,7 +429,6 @@
boutiqueAutoRuleService.startScheduler();
}
-
/**
* 鏇存柊绮鹃�夊簱鍟嗗搧
*/
@@ -400,11 +443,13 @@
if (map != null) {
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
- qualityFactoryService.updateQualityGoods(map.get(its.next()));
- CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(its.next());
+ String key = its.next();
+ taoBaoGoodsUpdateService.updateByTaoKeGoodsDetail(Long.parseLong(key));
+ CMQManager.getInstance().deleteNeedUpdateTaoBaoGoodsIdMsg(key);
}
}
} catch (Exception e) {
+ e.printStackTrace();
LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
}
}
--
Gitblit v1.8.0