Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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

@@ -101,6 +113,8 @@
      if (goods.getAuctionId() == null || goods.getAuctionId() == 0)

         throw new TaobaoGoodsUpdateException(2, "商品ID为空");



      // 设置商品正常上线

      goods.setState(0);

      // 更新收藏信息

      try {

         commonGoodsService.updateCommonGoods(CommonGoodsFactory.create(goods));

@@ -118,11 +132,16 @@


      // 更新动态商品

      activityService.updateRecommendActivityGoods(goods);



      // 更新分享库的商品

      shareHotGoodsService.updateShareGoods(goods);



      // 更新自购立减库商品

      tljBuyGoodsService.updateGoods(goods);

   }



   @Override

   public void deleteOutOfDate() {

      TaoBaoGoodsBriefMapper taoBaoGoodsBriefMapper = BeanUtil.getBean(TaoBaoGoodsBriefMapper.class);

      List<Long> list = taoBaoGoodsBriefMapper

            .queryCanDeleteGoods(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2), 0, 2000);

      for (Long auctionId : list) {

@@ -197,7 +216,7 @@
         if (goods.getId() == null || goods.getId() == 0L) {

            throw new TaobaoGoodsUpdateException(1, "商品主键ID为空");

         }

			


         // 需要更新的信息

         TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods);

         updateGoods.setCreatetime(goods.getCreatetime());

@@ -206,8 +225,7 @@


      taoBaoGoodsBriefMapper.updateBatchSelective(updateList);

   }

	
	


   @Override

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

      return taoBaoGoodsBriefMapper.listNeedUpdateGoodsId(start, count, hour);

@@ -220,27 +238,27 @@
         if (oldGoods == null) {

            return;

         }

			


         TaoBaoGoodsBrief newGoods = TaoKeApiUtil.searchGoodsDetail(id);

         if (newGoods == null) {

            return;

         }

			


         // 更新精选商品

         newGoods.setId(id);

         TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(newGoods);

         taoBaoGoodsBriefMapper.updateByPrimaryKeySelective(updateGoods);

			


         // 更新动态商品

         activityService.updateRecommendActivityGoods(newGoods);

						


         // 更新收藏信息

         try {

            commonGoodsService.updateCommonGoods(CommonGoodsFactory.create(newGoods));

         } catch (CommonGoodsException e) {

            e.printStackTrace();

         }

					


      } catch (TaobaoGoodsDownException e) {

         offlineTaoBaoGoods(id);

      } catch (Exception e) {