From 1d08203db8db23eb9ea6223182bb8b37497d0d73 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 16:50:27 +0800
Subject: [PATCH] 搜索发现商品

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java |   83 ++++++++++++++++++++++++++++-------------
 1 files changed, 56 insertions(+), 27 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 e7ff7df..c40c2ac 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
@@ -28,7 +28,6 @@
 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;
@@ -46,6 +45,7 @@
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
@@ -60,8 +60,8 @@
 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.SearchKeyTOPVO;
 import com.yeshi.fanli.vo.search.SearchKeyVO;
 import com.yeshi.fanli.vo.tlj.ReduceHongBao;
 
@@ -122,6 +122,9 @@
 
 	@Resource
 	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+	
+	@Resource
+	private DaTaoKeGoodsService daTaoKeGoodsService;
 
 	/**
 	 * 鏂扮増鎺ㄨ崘涓撻绠$悊(1.5.3)
@@ -651,34 +654,60 @@
 	}
 
 	
-	 
+	 /**
+	  *  鎼滅储鍙戠幇鍒楄〃
+	  * @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) {
-//		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();
-//				}
-//				
-//				
-//			}
-//			
+		int count = 0;
+		List<SearchKeyTOPVO> list = new ArrayList<SearchKeyTOPVO>();
+		
+	    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++) {
+					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));
+							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("result", gson.toJson(exchange));
-//			out.print(JsonUtil.loadTrueResult(data));
-//		} catch (IntegralExchangeException e) {
-//			out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
-//		}
+		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));
 	}
 	
 }

--
Gitblit v1.8.0