Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java

@@ -88,8 +88,9 @@
      List<DaTaoKeDetail> dtList = listByGoodsIds(goodsIdList);



      Map<Long, DaTaoKeDetail> map = new HashMap<>();

      for (DaTaoKeDetail goods : dtList)

         map.put(goods.getGoodsId(), goods);

      if (dtList != null)

         for (DaTaoKeDetail goods : dtList)

            map.put(goods.getGoodsId(), goods);

      for (TaoBaoGoodsBrief goods : goodsList) {

         DaTaoKeDetail detail = map.get(goods.getAuctionId());

         goods = DaTaoKeUtil.filterTaoBaoGoods(goods, detail);