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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -159,8 +159,13 @@
      for (TaoBaoGoodsBrief goods : goodsList)

         goodsIdList.add(goods.getAuctionId());



      List<DaTaoKeDetailV2> dtList = listByGoodsIds(goodsIdList);

      List<DaTaoKeDetailV2> dtList = null;



      try {

         dtList = listByGoodsIds(goodsIdList);

      } catch (Exception e) {



      }

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

      if (dtList != null)

         for (DaTaoKeDetailV2 goods : dtList)