From 0a51e12c7a0a4ce201d5ba8459d702d029beea19 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 17:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 65dbd68..b110e19 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1733,6 +1733,13 @@
root.put("time", nextTime.getTimeInMillis());
root.put("endTime", endTime > 0? endTime : 0);
root.put("listgoods", array);
+
+
+ JSONObject params = new JSONObject();
+ params.put("url", configService.get("spike_goods_link"));
+ JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+ root.put("params", params);
+ root.put("jumpDetail", jumpDetail);
return root;
}
@@ -1745,13 +1752,7 @@
*/
@RequestMapping(value = "getSpikeGoods")
public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
- JSONObject params = new JSONObject();
- params.put("url", configService.get("spike_goods_link"));
- JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
-
JSONObject root = getSpikeGoodsContent(acceptData);
- root.put("params", params);
- root.put("jumpDetail", jumpDetail);
out.print(JsonUtil.loadTrueResult(root));
}
--
Gitblit v1.8.0