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 | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 2fe2023..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,16 +8,25 @@
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;
+import com.yeshi.fanli.service.inter.brand.BrandClassShopService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
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.CMQManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
/**
* 娣樺疂鍟嗗搧鏇寸粏
@@ -46,6 +55,18 @@
@Resource
private QualityFlashSaleService qualityFlashSaleService;
+
+ @Resource
+ private BrandClassShopService brandClassShopService;
+
+ @Resource
+ private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
+
+ @Resource
+ private ShareHotGoodsService shareHotGoodsService;
+
+ @Resource
+ private TLJBuyGoodsService tljBuyGoodsService;
// 鍔ㄦ�佸晢鍝佹洿鏂� 锛�1涓皬鏃舵洿鏂�
@Scheduled(cron = "0 0 */1 * * ?")
@@ -83,7 +104,7 @@
}
try {
- qualityFactoryService.updateWeight(10, 3);
+ qualityFactoryService.updateWeight(1, 4);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -99,18 +120,20 @@
taoBaoGoodsUpdateService.deleteOutOfDate();
}
- // 娣诲姞绮鹃�夊簱涓渶瑕佹洿鏂扮殑娣樺疂鍟嗗搧ID(2涓皬鏃舵墽琛屼竴娆�)
- @Scheduled(cron = "0 0 1/2 * * ? ")
- public void addNeddUpdateTaoBaoGoods() {
- if (!Constant.IS_TASK) {
+ /**
+ * 鏇存柊瓒呰繃4涓皬鏃舵湭鏇存柊鐨勫晢鍝�
+ */
+ // 1涓皬鏃舵洿鏂�
+ @Scheduled(cron = "0 0 1/1 * * ? ")
+ public void addNeedUpdateTaoBaoGoods() {
+ if (!Constant.IS_TASK)
return;
- }
- List<Long> list = qualityFactoryService.queryNeedUpdate(0, 1000, 4);
+ List<Long> list = taoBaoGoodsUpdateService.listNeedUpdateGoodsId(0, 2000, 4);
if (list == null || list.size() == 0) {
return;
}
-
+
for (Long id : list) {
try {
CMQManager.getInstance().addNeedUpdateTaoBaoGoodsId(id);
@@ -125,7 +148,6 @@
*/
@Scheduled(cron = "0 15 0/6 * * ? ")
public void removeFlashSaleGoods() {
-
if (!Constant.IS_TASK) {
return;
}
@@ -140,8 +162,17 @@
}
} catch (Exception e) {
- LogHelper.errorDetailInfo(e);
+ LogHelper.errorDetailInfo(e);
}
}
+ // 鏇存柊鍝佺墝鍟嗗搧锛屾瘡澶╂棭涓�6鐐规墽琛屼竴娆�
+ @Scheduled(cron = "0 0 6 * * ? ")
+ public void updateBrandGoods() {
+ if (!Constant.IS_TASK)
+ return;
+ brandClassShopService.updateShopGoods();
+ }
+
+
}
--
Gitblit v1.8.0