From 010efba33ae0e00ff06e5a95004e0f624f073ba7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 15:34:45 +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 | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 03df1d2..93822f3 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;
@@ -95,6 +96,41 @@
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));
+ }
+
+ /**
* 鎼滅储-鏂扮増
*
* @param acceptData
@@ -149,8 +185,8 @@
return;
}
+ // 鎷煎澶氬晢鍝� TODO
if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) {
- // 鎷煎澶氬晢鍝� TODO
searchPDDGoods(kw, page, filter, order, startprice, endprice, out);
return;
}
@@ -554,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