From c044b6dd024b6884a4f39bc56e4873c95b13fe02 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 11:59:00 +0800
Subject: [PATCH] 免单更改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java
index 1e89774..5c462c1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PinDuoDuoControllerV2.java
@@ -88,8 +88,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("pinduoduo_special_index");
 			if (topPicList == null) {
 				topPicList = new ArrayList<SwiperPicture>();
@@ -111,8 +110,7 @@
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
 				for (PDDGoodsDetail goods : goodsList) {
-					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate,
-							shareRate);
+					GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, fanLiRate, shareRate);
 					array.add(gson.toJson(goodsDetailVO));
 				}
 			}

--
Gitblit v1.8.0