Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java

@@ -21,6 +21,8 @@
import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.util.BeanUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -41,6 +43,12 @@


   @Resource

   private CommonGoodsService commonGoodsService;



   @Resource

   private ShareHotGoodsService shareHotGoodsService;



   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;



   @Override

   public void startUpdate() {

@@ -90,6 +98,10 @@


      // 更新简版商品状态为下架

      commonGoodsService.offlineCommonGoods(auctionId, CommonGoods.GOODS_TYPE_TB);



      // 分享爆款数据删除

      shareHotGoodsService.deleteByGoodsId(auctionId);



   }



   @Transactional

@@ -118,6 +130,12 @@


      // 更新动态商品

      activityService.updateRecommendActivityGoods(goods);



      // 更新分享库的商品

      shareHotGoodsService.updateShareGoods(goods);



      // 更新自购立减库商品

      tljBuyGoodsService.updateGoods(goods);

   }



   @Override

@@ -206,7 +224,6 @@


      taoBaoGoodsBriefMapper.updateBatchSelective(updateList);

   }

	
   

   @Override

   public List<Long> listNeedUpdateGoodsId(long start, int count, int hour) {