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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -31,6 +31,7 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

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

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

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

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;

@@ -61,6 +62,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private QualityGoodsService qualityGoodsService;

@@ -369,8 +373,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) {

@@ -431,9 +435,7 @@
         count = taoBaoShopService.countBrandShopinfo(cid);

      }



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

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



      // 淘宝商品信息过滤

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

@@ -528,7 +530,7 @@


   

   @Override

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

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

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

         cid = null;

      }

@@ -538,9 +540,8 @@
         return listInfo;

      



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();

      ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());

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

      // 淘宝商品信息过滤

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