From bf5d1b405c759de3faa42af37b1f10f42823b105 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 2ab2f95..665b01a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
@@ -16,7 +16,9 @@
 import com.yeshi.fanli.service.inter.lable.LabelService;
 import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
 import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
+import com.yeshi.fanli.util.BeanUtil;
 import com.yeshi.fanli.util.CMQManager;
 import com.yeshi.fanli.util.Constant;
 
@@ -50,6 +52,9 @@
 
 	@Resource
 	private BrandClassShopService brandClassShopService;
+
+	@Resource
+	private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
 
 	// 鍔ㄦ�佸晢鍝佹洿鏂� 锛�1涓皬鏃舵洿鏂�
 	@Scheduled(cron = "0 0 */1 * * ?")
@@ -156,4 +161,13 @@
 		brandClassShopService.updateShopGoods();
 	}
 
+	/**
+	 * 姣忓皬鏃舵洿鏂颁竴娆�
+	 */
+	@Scheduled(cron = "0 0 0/1 * * ?")
+	public void update618() {
+		LogHelper.test("鏇存柊618鍟嗗搧");
+		taoBaoGoodsActivityService.sysncS618Goods();
+	}
+
 }

--
Gitblit v1.8.0