Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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,9 +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.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;



/**

 * 淘宝商品更细

@@ -50,6 +58,15 @@


   @Resource

   private BrandClassShopService brandClassShopService;



   @Resource

   private TaoBaoGoodsActivityService taoBaoGoodsActivityService;



   @Resource

   private ShareHotGoodsService shareHotGoodsService;



   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;



   // 动态商品更新 ，1个小时更新

   @Scheduled(cron = "0 0 */1 * * ?")

@@ -131,7 +148,6 @@
    */

   @Scheduled(cron = "0 15 0/6 * * ? ")

   public void removeFlashSaleGoods() {



      if (!Constant.IS_TASK) {

         return;

      }

@@ -153,7 +169,10 @@
   // 更新品牌商品，每天早上6点执行一次

   @Scheduled(cron = "0 0 6 * * ? ")

   public void updateBrandGoods() {

      if (!Constant.IS_TASK)

         return;

      brandClassShopService.updateShopGoods();

   }



	
}