From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index 5f45a5a..257ec87 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/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,9 @@
@Resource
private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
+
+ @Resource
+ private TaoBaoShopService taoBaoShopService;
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@@ -414,15 +419,20 @@
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("鏃犳硶鎼滅储閾炬帴"));
+ JSONObject data = new JSONObject();
+ data.put("result", new JSONArray());
+ data.put("count", 0);
+ data.put("nav", new JSONArray());
+ out.print(JsonUtil.loadTrueResult(data));
return;
}
@@ -470,6 +480,12 @@
listRecommendWords = TaoBaoUtil.getSuguestSearch(kw);
if (listRecommendWords == null || listRecommendWords.size() == 0) {
listRecommendWords = new ArrayList<String>();
+ }
+
+ List<TaoBaoShopVO> listShop =taoBaoShopService.getShopByKey(kw);
+ if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null
+ && listShop.get(0).getListGoods().size() > 2) {
+ data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));
}
}
@@ -936,7 +952,7 @@
private JSONObject searchDaTaoKeGoods(String key, int page, String filter, String order, String startprice,
String endprice) {
- page=page+1;
+ page = page + 1;
int sort = DaTaoKeApiUtil.SORT_DEFAULT;
if ("5".equalsIgnoreCase(order)) {
sort = DaTaoKeApiUtil.SORT_COMMISSION;
@@ -951,7 +967,7 @@
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
BigDecimal proportion = manageService.getFanLiRate();
- DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, page, 20, sort);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, null, null, page, 20, sort);
if (result != null && result.getGoodsList() != null)
for (DaTaoKeDetailV2 goods : result.getGoodsList()) {
listExtra.add(
--
Gitblit v1.8.0