Merge remote-tracking branch 'origin/master'

yujian

2019-05-30 ebce479a2d0634c90e5f80045e204248336b410d

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

@@ -69,7 +69,7 @@
   @Override

   public void deleteTaoBaoGoods(Long auctionId) {

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

      qualityFactoryService.deleteByTbAuctionId(auctionId);

      qualityFactoryService.deleteByTaoBaoGoodsId(auctionId);



      // 删除商品本身数据

      taoBaoGoodsBriefMapper.deleteByAuctionId(auctionId);

@@ -82,7 +82,7 @@
      activityService.downTaoBaoGoods(auctionId);



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

      qualityFactoryService.deleteByTbAuctionId(auctionId);

      qualityFactoryService.deleteByTaoBaoGoodsId(auctionId);



      // 删除商品本身数据

      taoBaoGoodsBriefMapper.deleteByAuctionId(auctionId);

@@ -182,6 +182,7 @@
      updateGoods.setRootCategoryName(goods.getRootCategoryName());

      updateGoods.setLeafCatId(goods.getLeafCatId());

      updateGoods.setLeafName(goods.getLeafName());

      updateGoods.setMaterialLibType(goods.getMaterialLibType());



      return updateGoods;

   }

@@ -194,14 +195,13 @@
      List<TaoBaoGoodsBrief> updateList = new ArrayList<>();



      for (TaoBaoGoodsBrief goods : goodsList) {



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

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

         }



			
         // 需要更新的信息

         TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods);

         updateGoods.setCreatetime(goods.getCreatetime());



         updateList.add(updateGoods);

      }