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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java

@@ -3,7 +3,9 @@
import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



@@ -311,6 +313,9 @@
         count = taoBaoShopService.countBrandShopinfo(cid);

      }



      // 淘宝商品信息过滤

      Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);



      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      for (TaoBaoShopVO taoBaoShopVO : listInfo) {



@@ -332,7 +337,8 @@
         List<TaoBaoGoodsBriefExtra> listGoods = new ArrayList<TaoBaoGoodsBriefExtra>();

         List<TaoBaoGoodsBrief> listGoodsBrief = taoBaoShopVO.getListGoodsBrief();

         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {

            listGoods.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

            listGoods.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsMap.get(taoBaoGoodsBrief.getAuctionId()),

                  proportion.toString(), null));

         }

         taoBaoShopVO.setListGoods(listGoods);

      }

@@ -340,6 +346,25 @@
      data.put("list", JsonUtil.getApiCommonGson().toJson(listInfo));



      return data;

   }



   /**

    * 获取过滤商品

    * 
    * @param listInfo

    * @return

    */

   private Map<Long, TaoBaoGoodsBrief> getFilterTaoBaoGoods(List<TaoBaoShopVO> listInfo) {

      // 过滤商品

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

      for (TaoBaoShopVO taoBaoShopVO : listInfo) {

         goodsList.addAll(taoBaoShopVO.getListGoodsBrief());

      }

      goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);

      Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();

      for (TaoBaoGoodsBrief goods : goodsList)

         goodsMap.put(goods.getAuctionId(), goods);

      return goodsMap;

   }



   @Override

@@ -407,6 +432,10 @@


      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();



      // 淘宝商品信息过滤

      Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterTaoBaoGoods(listInfo);



      for (TaoBaoShopVO taoBaoShopVO : listInfo) {



         Integer userType = taoBaoShopVO.getUserType();

@@ -433,11 +462,12 @@


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

         List<TaoBaoGoodsBrief> listGoodsBrief = taoBaoShopVO.getListGoodsBrief();



         // 商品添加到更新队列

         taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);

         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {

            GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,

                  shareRate);

            GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory

                  .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), null, fanLiRate, shareRate);

            listGoods.add(goodsDetailVO);

         }

         taoBaoShopVO.setListGoodsVO(listGoods);