From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
index e6fa99f..c6eae71 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -34,6 +35,9 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsService;
+
+ @Resource
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
/**
* 闄愭椂绉掓潃 鏁版嵁鏇存柊
@@ -113,7 +117,43 @@
@Override
public void run() {
- daTaoKeGoodsService.startSyncGoods();
+ daTaoKeGoodsDetailV2Service.startSyncGoods();
+ }
+ }).start();
+
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ @Scheduled(cron = "0 0/10 * * * ? ")
+ public void doUpdateJobNew() {
+ if (!Constant.IS_TASK)
+ return;
+ try {
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ daTaoKeGoodsDetailV2Service.updateNewGoods();
+ }
+ }).start();
+
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ @Scheduled(cron = "0 0/10 * * * ? ")
+ public void doDeleteJobNew() {
+ if (!Constant.IS_TASK)
+ return;
+ try {
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ daTaoKeGoodsDetailV2Service.deleteInvalid();
}
}).start();
--
Gitblit v1.8.0