Merge remote-tracking branch 'origin/master' into div

admin

2019-07-31 5046ecde3cd849511a337e25e13af7df7f1894bc

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -458,6 +458,12 @@
      // 大淘客数据

      DaTaoKeDetail daTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, listId, 1).get(0);



      try {

         daTaoKe = DaTaoKeUtil.filterDaTaoKe(TaoKeApiUtil.searchGoodsDetail(daTaoKe.getGoodsId()), daTaoKe);

      } catch (Exception e) {



      }



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

      TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);

      listGoods.add(taoBaoGoodsBrief);