From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 a89ef8c..e6fa99f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
@@ -34,7 +34,6 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsService;
-
/**
* 闄愭椂绉掓潃 鏁版嵁鏇存柊
@@ -49,20 +48,20 @@
if (listTaoKe == null || listTaoKe.size() == 0) {
return;
}
-
+
List<Long> listDaoKeId = new ArrayList<Long>();
- for (DaTaoKeDetail daTaoKeDetail: listTaoKe) {
+ for (DaTaoKeDetail daTaoKeDetail : listTaoKe) {
listDaoKeId.add(daTaoKeDetail.getId());
}
-
+
List<DaTaoKeDetail> listDetail = daTaoKeGoodsService.listByIds(listDaoKeId);
if (listDetail == null || listDetail.size() == 0) {
return;
}
-
+
List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();
- for (DaTaoKeDetail daTaoKeDetail: listDetail) {
- listgoods.add( TaoBaoUtil.convert(daTaoKeDetail));
+ for (DaTaoKeDetail daTaoKeDetail : listDetail) {
+ listgoods.add(TaoBaoUtil.convert(daTaoKeDetail));
}
String formatDate = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
@@ -85,8 +84,8 @@
}
}
- // 20鍒嗛挓鏇存柊涓�娆�
- @Scheduled(cron = "0 0/20 * * * ? ")
+ // 1涓皬鏃舵洿鏂颁竴娆�
+ @Scheduled(cron = "0 0 0/1 * * ? ")
public void doSyncJob() {
if (!Constant.IS_TASK)
return;
@@ -103,9 +102,9 @@
LogHelper.errorDetailInfo(e);
}
}
-
-
+
// 姣忓ぉ鏃╀笂鍚屾涓�娆�
+ @Scheduled(cron = "0 0 6 * * ? ")
public void doSyncJobNew() {
if (!Constant.IS_TASK)
return;
--
Gitblit v1.8.0