From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +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/RecommendControllerV2.java | 103 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 35 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 c40c2ac..10e1ca3 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,7 +12,6 @@
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;
@@ -21,6 +20,7 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.jd.JDGoods;
@@ -122,7 +122,7 @@
@Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
-
+
@Resource
private DaTaoKeGoodsService daTaoKeGoodsService;
@@ -172,10 +172,10 @@
root.put("spikeGoods", getSpikeGoodsContent(acceptData));
if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
root.put("scoreExchange", getScoreExchangeInfo(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, "鑾峰彇鏁版嵁澶辫触"));
@@ -349,8 +349,7 @@
root.put("tagImg", "http://img.flqapp.com/resource/score_exchange_tag.png");
return root;
}
-
-
+
/**
* 閲戝竵鍏戞崲淇℃伅
*
@@ -366,29 +365,28 @@
String name = arrayKeys.get(i).toString();
JSONObject params = new JSONObject();
params.put("searchKey", name);
-
+
SearchKeyVO keyVO = new SearchKeyVO();
keyVO.setName(name);
keyVO.setParams(params.toString());
array.add(keyVO);
}
}
-
+
JSONObject params = new JSONObject();
params.put("url", configService.get("search_discovery_h5_link"));
-
+
JSONObject root = new JSONObject();
root.put("picture", "http://img.flqapp.com/resource/home_search_found.png");
root.put("params", params);
root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web",
Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
-
+
root.put("jumpResult", jumpDetailV2Service.getByTypeCache("search_goods_result",
Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
root.put("keyList", array);
return root;
}
-
/**
* 棣栭〉搴曢儴鍟嗗搧鎺ㄨ崘
@@ -653,61 +651,96 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
- /**
- * 鎼滅储鍙戠幇鍒楄〃
- * @param acceptData
- * @param uid
- * @param page
- * @param out
- */
- @RequestMapping(value = "getSearchDiscoveryTop", method = RequestMethod.POST)
- public void getSearchDiscoveryTop(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
+ /**
+ * 鎼滅储鍙戠幇鍒楄〃
+ *
+ * @param acceptData
+ * @param uid
+ * @param page
+ * @param out
+ */
+ @RequestMapping(value = "getSearchDiscoveryTop")
+ public void getSearchDiscoveryTop(AcceptData acceptData, Long uid, Integer page, String callback, PrintWriter out) {
int count = 0;
List<SearchKeyTOPVO> list = new ArrayList<SearchKeyTOPVO>();
-
- String keys = configService.getSearchDiscoveryKeys();
+
+ String keys = configService.getSearchDiscoveryKeys();
if (!StringUtil.isNullOrEmpty(keys)) {
JSONArray arrayKeys = JSONArray.fromObject(keys);
if (arrayKeys != null && arrayKeys.size() > 0) {
count = arrayKeys.size();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+
int j = 1;
- for (int i = (page-1) * 3; i < arrayKeys.size(); i++) {
+ for (int i = (page - 1) * 3; i < arrayKeys.size(); i++) {
if (j > 3)
break;
-
+
String words = arrayKeys.get(i).toString();
List<GoodsDetailVO> listGoods = new ArrayList<GoodsDetailVO>();
-
+
List<DaTaoKeDetailV2> listTaoKe = daTaoKeGoodsService.getSearchDiscoveryGoods(words);
if (listTaoKe != null && listTaoKe.size() > 0) {
- for (DaTaoKeDetailV2 daTaoKeDetailV2: listTaoKe) {
- listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), null, fanLiRate,
- shareRate));
+ for (DaTaoKeDetailV2 daTaoKeDetailV2 : listTaoKe) {
+ listGoods.add(GoodsDetailVOFactory.convertTaoBao(TaoBaoUtil.convert(daTaoKeDetailV2), null,
+ fanLiRate, shareRate));
if (listGoods.size() >= 3)
break;
}
}
-
+
SearchKeyTOPVO keyTOPVO = new SearchKeyTOPVO();
keyTOPVO.setName(words);
keyTOPVO.setListGoods(listGoods);
list.add(keyTOPVO);
-
+
j++;
}
}
}
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
data.put("count", count);
data.put("list", gson.toJson(list));
- out.print(JsonUtil.loadTrueResult(data));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } else
+ out.print(JsonUtil.loadTrueResult(data));
}
-
+
+ /**
+ * 鑾峰彇涓撻娓犻亾娲诲姩
+ *
+ * @param acceptData
+ * @param uid
+ * @param callback
+ * @param out
+ */
+ @RequestMapping(value = "getSpecialChannelActivity")
+ public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
+ List<Special> list = specialService.listByPlaceKey("special_channel_activity");
+ // 鍒犻櫎灏氭湭鍚敤鐨勮繃鏈熺殑
+ for (int i = 0; i < list.size(); i++) {
+ Special special = list.get(i);
+ if (special.getState() == 1L) {
+ list.remove(i--);
+ }else{
+
+ }
+ }
+
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ Gson gson = gsonBuilder.create();
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ data.put("list", gson.toJson(list));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } else
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0