From 0d9ac58dc11f54351e5e18dba8e950717d78019f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 14:55:24 +0800
Subject: [PATCH] 搜索发现
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index 70cf105..e7ff7df 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.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;
@@ -27,6 +28,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.fanli.exception.integral.IntegralExchangeException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -58,6 +60,7 @@
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.goods.OtherInfo;
+import com.yeshi.fanli.vo.integral.ExchangeTipVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.search.SearchKeyVO;
import com.yeshi.fanli.vo.tlj.ReduceHongBao;
@@ -166,8 +169,10 @@
root.put("spikeGoods", getSpikeGoodsContent(acceptData));
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
root.put("scoreExchange", getScoreExchangeInfo(acceptData));
-
- root.put("searchDiscovery", getSearchDiscoveryInfo(acceptData));
+
+ if (VersionUtil.greaterThan_2_0_0(acceptData.getPlatform(), acceptData.getVersion()))
+ root.put("searchDiscovery", getSearchDiscoveryInfo(acceptData));
+
out.print(JsonUtil.loadTrueResult(root));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇鏁版嵁澶辫触"));
@@ -351,7 +356,7 @@
*/
private JSONObject getSearchDiscoveryInfo(AcceptData acceptData) {
JSONArray array = new JSONArray();
- String keys = configService.get("search_discovery_keys");
+ String keys = configService.getSearchDiscoveryKeys();
if (!StringUtil.isNullOrEmpty(keys)) {
JSONArray arrayKeys = JSONArray.fromObject(keys);
for (int i = 0; i < arrayKeys.size(); i++) {
@@ -645,4 +650,35 @@
out.print(JsonUtil.loadTrueResult(data));
}
+
+
+ @RequestMapping(value = "getSearchDiscoveryTop", method = RequestMethod.POST)
+ public void getSearchDiscoveryTop(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
+// try {
+// String keys = configService.getSearchDiscoveryKeys();
+// if (!StringUtil.isNullOrEmpty(keys)) {
+// JSONArray arrayKeys = JSONArray.fromObject(keys);
+// for (int i = (page-1) * 3; i < arrayKeys.size(); i++) {
+// String keys = arrayKeys.get(i).toString();
+// }
+//
+//
+// }
+//
+
+
+
+
+
+//
+// GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+// Gson gson = gsonBuilder.create();
+// JSONObject data = new JSONObject();
+// data.put("result", gson.toJson(exchange));
+// out.print(JsonUtil.loadTrueResult(data));
+// } catch (IntegralExchangeException e) {
+// out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+// }
+ }
+
}
--
Gitblit v1.8.0