From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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..08758b4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
@@ -8,6 +8,9 @@
import org.springframework.stereotype.Component;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.taobao.ShareHotGoods;
+import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
+import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
@@ -16,11 +19,14 @@
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.ShareHotGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
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;
+import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
/**
* 娣樺疂鍟嗗搧鏇寸粏
@@ -55,6 +61,12 @@
@Resource
private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
+
+ @Resource
+ private ShareHotGoodsService shareHotGoodsService;
+
+ @Resource
+ private TLJBuyGoodsService tljBuyGoodsService;
// 鍔ㄦ�佸晢鍝佹洿鏂� 锛�1涓皬鏃舵洿鏂�
@Scheduled(cron = "0 0 */1 * * ?")
@@ -136,7 +148,6 @@
*/
@Scheduled(cron = "0 15 0/6 * * ? ")
public void removeFlashSaleGoods() {
-
if (!Constant.IS_TASK) {
return;
}
@@ -158,16 +169,10 @@
// 鏇存柊鍝佺墝鍟嗗搧锛屾瘡澶╂棭涓�6鐐规墽琛屼竴娆�
@Scheduled(cron = "0 0 6 * * ? ")
public void updateBrandGoods() {
+ if (!Constant.IS_TASK)
+ return;
brandClassShopService.updateShopGoods();
}
- /**
- * 姣忓皬鏃舵洿鏂颁竴娆�
- */
- @Scheduled(cron = "0 0 0/1 * * ?")
- public void update618() {
- LogHelper.test("鏇存柊618鍟嗗搧");
- taoBaoGoodsActivityService.sysncS618Goods();
- }
-
+
}
--
Gitblit v1.8.0