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

yujian

2019-08-12 e068c9acf06cff7673fadfca686128f6d6d66e20

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

@@ -29,6 +29,7 @@
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.taobao.TaoBaoGoodsUpdateService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -63,6 +64,9 @@


   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;



   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;



   @Override

   public List<BrandClassShop> getExistByShopIds(List<Long> list) {

@@ -128,8 +132,8 @@


   @Override

   @Transactional

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

         throws BrandClassShopException {

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

         String key) throws BrandClassShopException {



      if (id == null) {

         throw new BrandClassShopException(1, "数据为空：请选择店铺");

@@ -170,7 +174,8 @@
      for (BrandClassShop brandClassShop : listQuery) {

         TaoBaoShop shop = brandClassShop.getShop();

         if (shop != null) {

            long couponNum = commonGoodsService.countBySellerIdAndHasCoupon(shop.getId(), Constant.SOURCE_TYPE_TAOBAO);

            long couponNum = commonGoodsService.countBySellerIdAndHasCoupon(shop.getId(),

                  Constant.SOURCE_TYPE_TAOBAO);

            brandClassShop.setCouponNum(couponNum);



            String shopLink = shop.getShopLink();

@@ -337,8 +342,6 @@
      return data;

   }



	
	
   @Override

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

   public JSONObject listEffectiveCacheV2(int page, Long cid) {

@@ -430,8 +433,11 @@


         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(taoBaoGoodsBrief, null, fanLiRate,

                  shareRate);

            listGoods.add(goodsDetailVO);

         }

         taoBaoShopVO.setListGoodsVO(listGoods);

@@ -441,8 +447,6 @@


      return data;

   }

	
	
   

   @Override

   public void addClick(Long shopId) {