From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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 68364f0..da405be 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
@@ -93,8 +93,7 @@
 	@RequestMapping(value = "getGoodsInfo")
 	public void getGoodsInfo(AcceptData acceptData, Long cid, Integer page, PrintWriter out) {
 		JSONObject root = new JSONObject();
-//		if (cid == 1 && page == 1) {
-		if (page == 1) {
+		if (cid == 1 && page == 1) {
 			List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("jingdong_special_index");
 			if (topPicList == null) {
 				topPicList = new ArrayList<SwiperPicture>();
@@ -117,8 +116,7 @@
 				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 				for (JDGoods goods : goodsList) {
-					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,
-							shareRate);
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate,	shareRate);
 					array.add(gson.toJson(goodsDetailVO));
 				}
 			}

--
Gitblit v1.8.0