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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java

@@ -26,9 +26,9 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

@@ -43,6 +43,9 @@


   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private TaoBaoShopService taoBaoShopService;

@@ -276,8 +279,8 @@
   

   

   @Override

   @Cacheable(value = "searchWuLiaoCache", key = "'searchWuLiaoV2-'+#sf")

   public JSONObject searchWuLiaoV2(SearchFilter sf) {

   @Cacheable(value = "searchWuLiaoCache", key = "'searchWuLiaoV2-'+#sf+'-'+#platform+'-'+#version")

   public JSONObject searchWuLiaoV2(SearchFilter sf,String platform,String version) {



      // 淘宝物料接口查询

      TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);

@@ -297,9 +300,7 @@
      int fh = sf.getHongbao();

      boolean ft = sf.isTmall();



      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);



      if (fq == 0 && fh == 0 && !ft) {

         if (result != null && result.getTaoBaoGoodsBriefs() != null)