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/JingDongControllerV2.java |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
index 8cdb78c..68364f0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
@@ -13,15 +13,10 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dto.jd.JDFilter;
-import com.yeshi.fanli.dto.jd.JDSearchFilter;
-import com.yeshi.fanli.dto.jd.JDSearchResult;
 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.bus.lable.QualityFactory;
 import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.jd.JDGoodsException;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -32,10 +27,7 @@
 import com.yeshi.fanli.service.inter.jd.JDGoodsService;
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 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.factory.goods.GoodsDetailVOFactory;
-import com.yeshi.fanli.util.taobao.SearchFilterUtil;
 import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 
 import net.sf.json.JSONArray;
@@ -94,14 +86,15 @@
 	
 	
 	/**
-	 * 浜笢涓撻
+	 * 浜笢涓撻 + 鍟嗗搧鍒楄〃
 	 * @param acceptData
 	 * @param out
 	 */
 	@RequestMapping(value = "getGoodsInfo")
 	public void getGoodsInfo(AcceptData acceptData, Long cid, Integer page, PrintWriter out) {
 		JSONObject root = new JSONObject();
-		if (cid == 1 && page == 1) {
+//		if (cid == 1 && page == 1) {
+		if (page == 1) {
 			List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("jingdong_special_index");
 			if (topPicList == null) {
 				topPicList = new ArrayList<SwiperPicture>();
@@ -115,31 +108,26 @@
 			root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));
 		}
 		
-		
 		try {
-			JDSearchResult result = jdGoodsService.specialSearch(page, cid);
+			List<JDGoods> goodsList = jdGoodsService.specialSearch(page, cid);
 			JSONArray array = new JSONArray();
-			JSONObject data = new JSONObject();
-			if (result != null) {
-				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) {
-						GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
-								shareRate);
-						array.add(gson.toJson(goodsDetailVO));
-					}
+			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) {
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
+							shareRate);
+					array.add(gson.toJson(goodsDetailVO));
 				}
 			}
 			
-			data.put("list", array);
-			data.put("count", 1000);
-			out.print(JsonUtil.loadTrueResult(data));
+			root.put("list", array);
+			root.put("count", 1000);
+			out.print(JsonUtil.loadTrueResult(root));
 		} catch (JDGoodsException e) {
-			e.printStackTrace();
+			out.print(JsonUtil.loadFalseResult(e.getMsg()));
 		}
 	}
 

--
Gitblit v1.8.0