From 531d93708df8017e59830f15b41f3cc42d6126e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2019 17:53:01 +0800
Subject: [PATCH] 1.5.7版本需求

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
index f2a129a..95a0dc6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
@@ -50,9 +50,9 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "listPreGoods", method = RequestMethod.GET)
-	public void listPreGoods(String callback, AcceptData acceptData, String kw, PrintWriter out) {
+	public void listPreGoods(String callback, AcceptData acceptData, String kw, Integer page, PrintWriter out) {
 		// 澶ф窐瀹㈡暟鎹紝鏇存柊
-		List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods();
+		List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods(page);
 		JSONArray array = new JSONArray();
 		Gson gson = new Gson();
 		for (TaoBaoGoodsBrief goods : list) {
@@ -116,10 +116,11 @@
 
 		// 鏈�澶�30涓晢鍝�
 		List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day, 30);
-		BigDecimal rate = hongBaoManageService.getFanLiRate();
 		JSONArray array = new JSONArray();
 		for (ShareHotGoods sh : listGoods) {
-			TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(), rate + "", null);
+			TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(), 100 + "", null);
+			if (!StringUtil.isNullOrEmpty(item.getPictUrlWhite()))
+				item.setPictUrl(item.getPictUrlWhite());
 			item.setAuctionUrl(sh.getId());
 			array.add(item);
 		}

--
Gitblit v1.8.0