用户注册信息

yujian

2020-01-18 f4a0f2acc63d7785eab108419a4e16f5f688cb95

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

@@ -16,6 +16,7 @@
import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.dao.mybatis.brand.BrandClassShopMapper;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.entity.brand.BrandClass;

import com.yeshi.fanli.entity.brand.BrandClassShop;

import com.yeshi.fanli.entity.goods.CommonGoods;

@@ -29,8 +30,8 @@
import com.yeshi.fanli.service.inter.brand.TaoBaoShopHistoryService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.util.Constant;

@@ -76,7 +77,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public String saveShopInfo(Long cid, List<Long> list) throws BrandClassShopException {

      if (list == null || list.size() == 0) {

         throw new BrandClassShopException(1, "请选择店铺");

@@ -133,7 +134,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,

         String key) throws BrandClassShopException {



@@ -368,8 +369,8 @@
   }



   @Override

   @Cacheable(value = "brandCache", key = "'listEffectiveCacheV2-'+#page+'-'+#cid")

   public JSONObject listEffectiveCacheV2(int page, Long cid) {

   @Cacheable(value = "brandCache", key = "'listEffectiveCacheV2-'+#page+'-'+#cid+'-'+#platform+'-'+#version")

   public JSONObject listEffectiveCacheV2(int page, Long cid,String platform,String version) {

      long countShop = 0;



      if (cid != null && cid <= 0) {

@@ -430,8 +431,7 @@
         count = taoBaoShopService.countBrandShopinfo(cid);

      }



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO =    hongBaoManageService.getShowComputeRate(platform, version);



      // 淘宝商品信息过滤

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

@@ -467,7 +467,7 @@
         taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);

         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {

            GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory

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

                  .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()),paramsDTO);

            listGoods.add(goodsDetailVO);

         }

         taoBaoShopVO.setListGoodsVO(listGoods);

@@ -524,4 +524,98 @@


   }



	
   @Override

   public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid,String platform,String version) {

      if (cid != null && cid <= 0) {

         cid = null;

      }

		
      List<TaoBaoShopVO> listInfo = taoBaoShopService.listBrandShopinfo(start, count, cid);

      if (listInfo == null || listInfo.size() == 0)

         return listInfo;

		


      ConfigParamsDTO paramsDTO = 
            hongBaoManageService.getShowComputeRate(platform, version);

      // 淘宝商品信息过滤

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



      for (TaoBaoShopVO taoBaoShopVO : listInfo) {

         String shopNameCustom = taoBaoShopVO.getShopNameCustom();

         if (!StringUtil.isNullOrEmpty(shopNameCustom)) {

            taoBaoShopVO.setShopName(shopNameCustom);

         }



         String shopIconCustom = taoBaoShopVO.getShopIconCustom();

         if (!StringUtil.isNullOrEmpty(shopIconCustom)) {

            taoBaoShopVO.setShopIcon(shopIconCustom);

         }



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

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

         // 商品添加到更新队列

         taoBaoGoodsUpdateService.addUpdateQueueAsync(listGoodsBrief);

         for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {

            GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory

                  .convertTaoBao(goodsMap.get(taoBaoGoodsBrief.getAuctionId()), paramsDTO);

            listGoods.add(goodsDetailVO);

         }

         taoBaoShopVO.setListGoodsVO(listGoods);

      }

      return listInfo;

   }



	
   @Override

   public long countBrandShopinfo(Long cid) {

      if (cid != null && cid <= 0) {

         cid = null;

      }

      return taoBaoShopService.countBrandShopinfo(cid);

   }

	
	
	
   @Override

   public List<TaoBaoShop> listEffectiveClassShop(Long cid) {

      if (cid == null)

         return null;

		
      List<BrandClassShop> list = brandClassShopMapper.listEffective(cid);

      if (list == null || list.size() == 0)

         return null;



       List<TaoBaoShop> listShop = new ArrayList<TaoBaoShop>();

      for (BrandClassShop brandClassShop : list) {

         TaoBaoShop shop = brandClassShop.getShop();

         if (shop != null) {

            Integer userType = shop.getUserType();

            if (userType == null || userType == 0) {

               shop.setUserType(10);

            } else {

               shop.setUserType(11);

            }



            String shopLink = shop.getShopLink();

            if (StringUtil.isNullOrEmpty(shopLink)) {

               shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));

            }



            String shopNameCustom = shop.getShopNameCustom();

            if (!StringUtil.isNullOrEmpty(shopNameCustom)) {

               shop.setShopName(shopNameCustom);

            }



            String shopIconCustom = shop.getShopIconCustom();

            if (!StringUtil.isNullOrEmpty(shopIconCustom)) {

               shop.setShopIcon(shopIconCustom);

            }



            listShop.add(shop);

         }

      }

      return listShop;

   }

	
}