比价相关的bug修复

admin

2020-07-22 73a3d86a47d8da711b609cd224c63526f7d00f9b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java

@@ -20,7 +20,7 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;

import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeGoodsResult;

import com.yeshi.fanli.entity.accept.AcceptData;

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

import com.yeshi.fanli.entity.bus.recommend.Honest;

@@ -29,29 +29,28 @@
import com.yeshi.fanli.entity.system.ConfigKeyEnum;

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.HotSearchService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.HistorySearchService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.EhcacheUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;

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

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

import com.yeshi.fanli.vo.brand.TaoBaoShopVO;

@@ -307,7 +306,7 @@
         }

         sf.setParams(params);

      }

      TaoBaoSearchResult result = TaoBaoUtil.search(sf);

      TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null);

      if (result == null) {

         return null;

      }

@@ -622,7 +621,7 @@
      if (page == 1)

         daTaoKeList = daTaoKeGoodsDetailV2Service.listByDtitle(kw);



      TaoBaoSearchResult result = TaoBaoUtil.search(sf);

      TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null);

      if (result == null) {

         return null;

      }