Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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 * * ?")

@@ -99,20 +120,20 @@
      taoBaoGoodsUpdateService.deleteOutOfDate();

   }





   /**

    * 更新超过4个小时未更新的商品

    */

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

   public void addNeddUpdateTaoBaoGoods() {

      if (!Constant.IS_TASK) 
   // 1个小时更新

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

   public void addNeedUpdateTaoBaoGoods() {

      if (!Constant.IS_TASK)

         return;

		
      List<Long> list = taoBaoGoodsUpdateService.listNeedUpdateGoodsId(0, 4000, 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);

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

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

   public void removeFlashSaleGoods() {



      if (!Constant.IS_TASK) {

         return;

      }

@@ -142,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();

   }



	
}