From 07a2639739705af4e2f8676d18fdcc10739b0474 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 14:43:28 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 8a53dde..b209b3c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -12,6 +12,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
@@ -93,6 +94,41 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+ /**
+ * 鎼滅储鍊欓�夎瘝
+ *
+ * @param acceptData
+ * @param kw
+ * @param out
+ */
+ @RequestMapping(value = "suggestSearch", method = RequestMethod.POST)
+ public void getSugguestSearch(AcceptData acceptData, String kw, Integer goodsType, PrintWriter out) {
+ if (goodsType == null) {
+ out.print(JsonUtil.loadFalseResult("骞冲彴绫诲瀷涓嶈兘涓虹┖"));
+ return;
+ }
+
+ List<String> list = null;
+ if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ list = TaoBaoUtil.getSuguestSearch(kw);
+ } else if (goodsType == Constant.SOURCE_TYPE_JD) {
+
+ } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+
+ }
+
+ if (list == null || list.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("鏆傛棤寤鸿鍐呭"));
+ return;
+ }
+
+ JSONArray array = new JSONArray();
+ for (String words : list) {
+ array.add(words);
+ }
+ out.print(JsonUtil.loadTrueResult(array));
+ }
/**
* 鎼滅储-鏂扮増
@@ -181,7 +217,7 @@
// 鑾峰彇鎺ㄨ崘璇�
List<String> listRecommendWords = new ArrayList<String>();
// 缁煎悎 鏌ヨ绗竴椤垫椂鑾峰彇鍊欓�夎瘝
- if (page == 0) {
+ if (page == 1) {
listRecommendWords = TaoBaoUtil.getSuguestSearch(kw);
if (listRecommendWords == null || listRecommendWords.size() == 0) {
listRecommendWords = new ArrayList<String>();
@@ -439,7 +475,6 @@
*/
private JSONObject searchDaTaoKeGoods(String key, int page, String filter, String order, String startprice,
String endprice) {
- page = page + 1;
int sort = DaTaoKeApiUtil.SORT_DEFAULT;
if ("5".equalsIgnoreCase(order)) {
sort = DaTaoKeApiUtil.SORT_COMMISSION;
@@ -555,8 +590,8 @@
jdfilter.setSortName(JDSearchFilter.SORTNAME_COMMISSION_SHARE);
break;
default: // 榛樿锛氶攢閲� desc
- //jdfilter.setSort(JDSearchFilter.SORT_DESC);
- //jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
+ // jdfilter.setSort(JDSearchFilter.SORT_DESC);
+ // jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
break;
}
--
Gitblit v1.8.0