From 219a6869de1d26c6e048a6188bee722b3b98ea34 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 17 五月 2019 14:43:40 +0800
Subject: [PATCH] 动态邀请素材 3天以后也删除
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index d7e407d..b74c83e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1727,9 +1727,11 @@
// 缂撳瓨鍗婁釜灏忔椂
redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
}
-
+ Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
+
JSONObject root = new JSONObject();
root.put("time", nextTime.getTimeInMillis());
+ root.put("endTime", endTime > 0? endTime : 0);
root.put("listgoods", array);
return root;
@@ -1743,7 +1745,13 @@
*/
@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));
}
@@ -1923,9 +1931,11 @@
goodsJson.put("price", tb.getReservePrice().toString());
goodsJson.put("zkPrice", tb.getZkPrice().toString());
+
// 30澶╅攢閲�
goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
-
+ goodsJson.put("salesCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
+
// 鍒嗕韩璧�
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
data.put("shareMoney", "楼" + shareMoney);
@@ -2017,8 +2027,8 @@
goodsJson.put("hongBao", hongBao);
List<ClientTextStyleVO> labels = new ArrayList<>();
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
goodsJson.put("labels", labels);
data.put("tbPidInfo", clientTBPid);
@@ -2077,6 +2087,9 @@
data.put("shareUsers", listShareUser);
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
+
+ data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));
+
// 鍟嗗搧閾炬帴
String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");
--
Gitblit v1.8.0