Merge remote-tracking branch 'origin/master'

yujian

2019-06-11 aba5dee7a341ecb60fe02f088684aa982ac037f9

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

@@ -43,6 +43,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

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

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

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

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

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

@@ -54,6 +55,7 @@
import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;

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

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

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



import net.sf.ehcache.Element;

import net.sf.json.JSONArray;

@@ -89,6 +91,10 @@


   @Resource

   private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;

	
   @Resource

   private TaoBaoShopService taoBaoShopService;

	


   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

@@ -414,12 +420,12 @@


      historySearchService.addHistorySearch(kw, bid);



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

      }

//      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

//            acceptData.getPackages());

//      if (system == null) {

//         out.print(JsonUtil.loadFalseResult("系统不存在"));

//         return;

//      }



      if (!StringUtil.isNullOrEmpty(kw) && (kw.startsWith("http://") || kw.startsWith("https://"))) {

         out.print(JsonUtil.loadFalseResult("无法搜索链接"));

@@ -471,6 +477,11 @@
         if (listRecommendWords == null || listRecommendWords.size() == 0) {

            listRecommendWords = new ArrayList<String>();

         }

			
         List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKey(kw);

         if (listShop != null && listShop.size() > 0) {

            data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));

         }

      }



      Gson gson = new GsonBuilder().create();