From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 99 +++++++++++++++++++++++++++++++------------------
1 files changed, 63 insertions(+), 36 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 85bccc3..a28a7f7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -1,7 +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;
import java.util.Map;
@@ -13,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;
@@ -28,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;
@@ -70,7 +71,7 @@
private OrderProcessService orderProcessService;
@Resource
- private QualityFactoryService qualityFactoryService;
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Resource
private UserSystemCouponService userSystemCouponService;
@@ -109,16 +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(); // 鏇存柊鍟嗗搧闃熷垪
}
}
@@ -181,6 +181,45 @@
*/
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);
+ 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
@@ -188,16 +227,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 {
@@ -372,7 +414,7 @@
}
}
} catch (Exception e) {
-
+ LogHelper.errorDetailInfo(e);
}
}
}
@@ -387,43 +429,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());
-
}
}
}
--
Gitblit v1.8.0