Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

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

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



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

      for (DaTaoKeDetailV2 goods : dtList)

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

      if (dtList != null)

         for (DaTaoKeDetailV2 goods : dtList)

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

      for (TaoBaoGoodsBrief goods : goodsList) {

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

         goods = DaTaoKeUtil.filterTaoBaoGoods(goods, detail);