Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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

@@ -12,13 +12,13 @@


import com.google.gson.Gson;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.service.inter.activity.ActivityService;

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

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

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

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

import com.yeshi.fanli.util.BeanUtil;

@@ -28,8 +28,6 @@


@Service

public class TaoBaoGoodsUpdateServiceImpl implements TaoBaoGoodsUpdateService {

   @Resource

   private RecommendSectionGoodsService recommendSectionGoodsService;



   @Resource

   private ActivityService activityService;

@@ -60,7 +58,7 @@
            }



         } catch (TaobaoGoodsDownException e) {

            downTaoBaoGoods(goods.getAuctionId());

            offlineTaoBaoGoods(goods.getAuctionId());

         } catch (Exception e) {



         }

@@ -70,9 +68,6 @@
   @Transactional

   @Override

   public void deleteTaoBaoGoods(Long auctionId) {

      // 删除首页推荐数据

      recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(auctionId);



      // 删除精选库相关的数据

      qualityFactoryService.deleteByTbAuctionId(auctionId);



@@ -82,9 +77,7 @@


   @Transactional

   @Override

   public void downTaoBaoGoods(Long auctionId) {

      // 删除首页推荐数据

      recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(auctionId);

   public void offlineTaoBaoGoods(Long auctionId) {

      // 更新动态数据

      activityService.downTaoBaoGoods(auctionId);



@@ -93,6 +86,9 @@


      // 删除商品本身数据

      taoBaoGoodsBriefMapper.deleteByAuctionId(auctionId);



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

      commonGoodsService.offlineCommonGoods(auctionId, CommonGoods.GOODS_TYPE_TB);

   }



   @Transactional

@@ -120,6 +116,9 @@
            taoBaoGoodsBriefMapper.updateByPrimaryKeySelective(updateGoods);



         }



      // 更新动态商品

      activityService.updateRecommendActivityGoods(goods);

   }



   @Override

@@ -145,6 +144,7 @@
      // 更新标题，商品图片，销量，价格，券信息，返利信息，店铺信息，分类信息

      updateGoods.setTitle(goods.getTitle());

      updateGoods.setPictUrl(goods.getPictUrl());

      updateGoods.setPictUrlWhite(goods.getPictUrlWhite());

      updateGoods.setImgList(goods.getImgList());

      updateGoods.setBiz30day(goods.getBiz30day());

      updateGoods.setZkPrice(goods.getZkPrice());

@@ -182,20 +182,30 @@
      updateGoods.setRootCategoryName(goods.getRootCategoryName());

      updateGoods.setLeafCatId(goods.getLeafCatId());

      updateGoods.setLeafName(goods.getLeafName());

      updateGoods.setMaterialLibType(goods.getMaterialLibType());



      return updateGoods;

   }



   @Override

   public void updateTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) throws TaobaoGoodsUpdateException {

      if (goodsList == null)

         return;

      if (goodsList == null || goodsList.size() == 0)

         throw new TaobaoGoodsUpdateException(1, "商品列表为空");



      List<TaoBaoGoodsBrief> updateList = new ArrayList<>();



      for (TaoBaoGoodsBrief goods : goodsList) {

         if (goods.getId() == null || goods.getId() == 0L)



         if (goods.getId() == null || goods.getId() == 0L) {

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

         updateList.add(goods);

         }



         TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods);

         updateGoods.setCreatetime(goods.getCreatetime());



         updateList.add(updateGoods);

      }



      taoBaoGoodsBriefMapper.updateBatchSelective(updateList);

   }