From 3d479c3901d087b298630334553253726f5d75c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 六月 2019 10:53:13 +0800
Subject: [PATCH] 分享爆品库调整

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 acdc14e..f2a129a 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
@@ -70,11 +70,13 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "setShareGoods", method = RequestMethod.GET)
-	public void setShareGoods(String callback, AcceptData acceptData, String ids, PrintWriter out) {
+	public void setShareGoods(String callback, AcceptData acceptData, String ids, String day, PrintWriter out) {
 		// 澶ф窐瀹㈡暟鎹紝鏇存柊
 		JSONArray array = JSONArray.fromObject(ids);
 
-		String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+		if (StringUtil.isNullOrEmpty(day)) {
+			day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+		}
 		int count = 0;
 		for (int i = 0; i < array.size(); i++) {
 			// 鑾峰彇鍟嗗搧璇︽儏
@@ -112,7 +114,8 @@
 			day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
 		}
 
-		List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day);
+		// 鏈�澶�30涓晢鍝�
+		List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day, 30);
 		BigDecimal rate = hongBaoManageService.getFanLiRate();
 		JSONArray array = new JSONArray();
 		for (ShareHotGoods sh : listGoods) {

--
Gitblit v1.8.0