From a503900f405a39f3aa30a8663ca661cf3c6b55ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:47 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 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 f80adc8..a5166f0 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,6 @@
package com.yeshi.fanli.util;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -28,10 +27,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 +69,7 @@
private OrderProcessService orderProcessService;
@Resource
- private QualityFactoryService qualityFactoryService;
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Resource
private UserSystemCouponService userSystemCouponService;
@@ -114,11 +113,9 @@
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
- doUpdateGoodsJob();
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
- } else if (!Constant.IS_TEST) {
- initScheduler();// 鍚姩瀹氭椂浠诲姟
- //
+ initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
+ doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
}
}
@@ -372,7 +369,7 @@
}
}
} catch (Exception e) {
-
+ LogHelper.errorDetailInfo(e);
}
}
}
@@ -387,43 +384,29 @@
boutiqueAutoRuleService.startScheduler();
}
+
+ /**
+ * 鏇存柊绮鹃�夊簱鍟嗗搧
+ */
public void doUpdateGoodsJob() {
-
- // 閲囩敤4涓嚎绋嬪仛鏇存柊
- for (int i = 0; i < 4; i++)
+ 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