淘口令格式兼容

admin

2020-09-24 ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99

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

@@ -6,6 +6,7 @@


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.yeshi.utils.JsonUtil;

@@ -13,23 +14,18 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dao.mybatis.TaoBaoClassRelationMapper;

import com.yeshi.fanli.dao.mybatis.lable.LabelGoodsMapper;

import com.yeshi.fanli.dao.mybatis.lable.QualityFactoryMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.entity.bus.lable.Label;

import com.yeshi.fanli.entity.bus.lable.LabelGoods;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

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

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;

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.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.util.StringUtil;

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

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

@@ -41,28 +37,19 @@
public class QualityGoodsServiceImpl implements QualityGoodsService {



   @Resource

   private RedisManager redisManager;

   @Resource

   private QualityFactoryMapper qualityFactoryMapper;

   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

   @Resource

   private LabelGoodsMapper labelGoodsMapper;

   @Resource

   private LabelService labelService;

   @Resource

   private TaoBaoGoodsBriefMapper taoBaoGoodsBriefMapper;

   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

   private TaoBaoClassRelationMapper taoBaoClassRelationMapper;

   private LabelGoodsMapper labelGoodsMapper;



   @Resource

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource

   private HongBaoManageService hongBaoManageService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;

@@ -333,8 +320,8 @@
    * 首页最底部@商品信息流

    */

   @Override

   @Cacheable(value = "qualityCache", key = "'getRecommendToIndexV2-'+#start+'-'+#platform+'-'+#version")

   public JSONArray getRecommendToIndexV2(long start, int count, String platform, String version) {

   @Cacheable(value = "qualityCache", key = "'getRecommendToIndexV2-'+#start+'-'+#platform+'-'+#version+'-'+#system")

   public JSONArray getRecommendToIndexV2(long start, int count, String platform, String version, SystemEnum system) {



      // 返利金额2元以上；

      Integer commision = 2;

@@ -345,7 +332,7 @@
      // 优惠率高于10%以上（优惠率=优惠券面额/商品在售价*100%）

      Double couponRatio = 10.0;



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(system);

      Double pop = 50.0;

      if (fanLiRate != null) {

         pop = Double.parseDouble(fanLiRate.toString());

@@ -372,7 +359,7 @@
      } catch (Exception e) {

      }



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

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



      for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {

         GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);