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;

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

      }



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

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



      // 淘宝商品信息过滤

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

@@ -537,7 +541,7 @@
      



      ConfigParamsDTO paramsDTO = 

            hongBaoManageService.getShowComputeRate(platform, version);

            orderHongBaoMoneyComputeService.getShowComputeRate(platform, version);

      // 淘宝商品信息过滤

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