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/UpdateTaoBaoGoodsJob.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
index 665b01a..e8c0c6c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
@@ -136,7 +136,6 @@
*/
@Scheduled(cron = "0 15 0/6 * * ? ")
public void removeFlashSaleGoods() {
-
if (!Constant.IS_TASK) {
return;
}
@@ -158,6 +157,8 @@
// 鏇存柊鍝佺墝鍟嗗搧锛屾瘡澶╂棭涓�6鐐规墽琛屼竴娆�
@Scheduled(cron = "0 0 6 * * ? ")
public void updateBrandGoods() {
+ if (!Constant.IS_TASK)
+ return;
brandClassShopService.updateShopGoods();
}
@@ -166,6 +167,8 @@
*/
@Scheduled(cron = "0 0 0/1 * * ?")
public void update618() {
+ if (!Constant.IS_TASK)
+ return;
LogHelper.test("鏇存柊618鍟嗗搧");
taoBaoGoodsActivityService.sysncS618Goods();
}
--
Gitblit v1.8.0