From 6f3ee199558c79d840137c1a77efe462aca63178 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 26 七月 2019 18:04:21 +0800
Subject: [PATCH] 京东专题 + 拼多多

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java |  154 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 151 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index ac0345e..422d558 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -14,13 +14,23 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.common.CommonContentNav;
 import com.yeshi.fanli.dto.common.CommonContentResult;
 import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
+import com.yeshi.fanli.dto.common.JDCommonContentTypeEnum;
+import com.yeshi.fanli.dto.common.PDDCommonContentTypeEnum;
+import com.yeshi.fanli.dto.jd.JDSearchResult;
+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.SwiperPicture;
+import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
+import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;
+import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -45,7 +55,43 @@
 	@Resource
 	private CommonTemplateContentService commonTemplateContentService;
 
+	@Resource
+	private JDCommonTemplateContentService jdCommonTemplateContentService;
 
+	@Resource
+	private PDDCommonTemplateContentService pddCommonTemplateContentService;
+
+	
+	/**
+	 * 閫氱敤妯℃澘瀵艰埅
+	 * 
+	 * @param acceptData
+	 * @param key
+	 * @param out
+	 */
+	@RequestMapping(value = "getNavList", method = RequestMethod.POST)
+	public void getNavList(AcceptData acceptData, String key, Integer goodsType, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(key)) {
+			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
+			return;
+		}
+		
+		List<CommonContentNav> list = null;
+		if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+			list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
+		} else if (goodsType == Constant.SOURCE_TYPE_JD) {
+			
+		} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+			
+		}
+		
+		if (list == null) {
+			list = new ArrayList<CommonContentNav>();
+		}
+		
+		out.print(JsonUtil.loadTrueResult(new Gson().toJson(list)));
+	}
+	
 	/**
 	 * 鑾峰彇鍐呭
 	 * 
@@ -56,7 +102,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "getNavGoodsList", method = RequestMethod.POST)
-	public void getNavContent(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
+	public void getNavContent(AcceptData acceptData, String key, Integer goodsType, Integer page, String cid, PrintWriter out) {
 		if (StringUtil.isNullOrEmpty(key)) {
 			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
 			return;
@@ -67,6 +113,25 @@
 			return;
 		}
 
+		if (goodsType == null || goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+			getListTB(acceptData, key, page, cid, out);
+			return;
+		}
+		
+		if (goodsType == Constant.SOURCE_TYPE_JD) {
+			getListJD(acceptData, key, page, cid, out);
+			return;
+		}
+		
+		if (goodsType == Constant.SOURCE_TYPE_PDD) {
+			getListPDD(acceptData, key, page, cid, out);
+			return;
+		}
+		out.print(JsonUtil.loadFalseResult("goodsType鍙傛暟涓嶆纭�"));
+	}
+
+	
+	private void getListTB(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
 		CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
 				cid, page, Constant.PAGE_SIZE);
 
@@ -85,9 +150,92 @@
 		for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
 			array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate)));
 		}
-		root.put("goodsList", array);
-		root.put("goodsCount", result.getCount());
+		
+		root.put("list", array);
+		root.put("count", result.getCount());
 		out.print(JsonUtil.loadTrueResult(root));
 	}
+	
+	
+	/**
+	 * 浜笢閫氱敤涓撻妯℃澘
+	 * @param acceptData
+	 * @param key
+	 * @param page
+	 * @param cid
+	 * @param out
+	 */
+	public void getListJD(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
+		JSONObject data = new JSONObject();
+		if (page == 1) {
+			List<SwiperPicture> bannerList = new ArrayList<>();
+			data.put("bannerList", new Gson().toJson(bannerList));
+		}
+
+		JDSearchResult result = jdCommonTemplateContentService.getContentList(JDCommonContentTypeEnum.valueOf(key), cid, page, Constant.PAGE_SIZE);
+		JSONArray array = new JSONArray();
+		
+		long count = 0;
+		if (result != null) {
+			PageEntity pageEntity = result.getPageEntity();
+			if (pageEntity != null) {
+				count = pageEntity.getTotalCount();
+			}
+			
+			List<JDGoods> goodsList = result.getGoodsList();
+			if (goodsList != null && goodsList.size() > 0) {
+				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+				BigDecimal shareRate = hongBaoManageService.getShareRate();
+				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+				for (JDGoods goods : goodsList) {
+					array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate, shareRate)));
+				}
+			}
+		}
+		
+		data.put("list", array);
+		data.put("count", count);
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+	
+	
+	/**
+	 *   鎷煎澶氶�氱敤涓撻妯℃澘
+	 * @param acceptData
+	 * @param key
+	 * @param page
+	 * @param cid
+	 * @param out
+	 */
+	public void getListPDD(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
+		JSONObject data = new JSONObject();
+		if (page == 1) {
+			List<SwiperPicture> bannerList = new ArrayList<>();
+			data.put("bannerList", new Gson().toJson(bannerList));
+		}
+		
+		PDDGoodsResult result = pddCommonTemplateContentService.getContentList(PDDCommonContentTypeEnum.valueOf(key), cid, page, Constant.PAGE_SIZE);
+		JSONArray array = new JSONArray();
+		long count = 0;
+		if (result != null) {
+			count = result.getTotalCount();
+			
+			List<PDDGoodsDetail> goodsList = result.getGoodsList();
+			if (goodsList != null && goodsList.size() > 0) {
+				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+				BigDecimal shareRate = hongBaoManageService.getShareRate();
+				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+				for (PDDGoodsDetail goods : goodsList) {
+					array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate, shareRate)));
+				}
+			}
+		}
+		
+		data.put("list", array);
+		data.put("count", count);
+		out.print(JsonUtil.loadTrueResult(data));
+	}
 
 }

--
Gitblit v1.8.0