From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 863bf7c..ec535c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
+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;
@@ -72,6 +73,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+ @Resource
+ private TaoBaoOrderService taoBaoOrderService;
+
private static boolean isInited = false;
public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -99,9 +103,10 @@
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
+ doUpdateGoodsJob();
} else if (!Constant.IS_TEST) {
initScheduler();// 鍚姩瀹氭椂浠诲姟
- // doUpdateGoodsJob();
+ //
}
}
@@ -164,7 +169,7 @@
*/
public void doTaoBaoOrders() {
// 鍚屾椂寮�鍚�3涓嚎绋嬪鐞�
- for (int i = 0; i < 3; i++) {
+ for (int i = 0; i < 1; i++) {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -173,6 +178,13 @@
// 鍙�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<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);
+ map.put(orderId, orderList);
+ }
orderProcessService.processOrder(map);
}
} catch (Exception e) {
--
Gitblit v1.8.0