From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 14 五月 2019 11:03:25 +0800 Subject: [PATCH] Merge branch 'div_8' --- fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 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 4e72297..07c841a 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 @@ -1602,6 +1602,8 @@ if ("ios".equalsIgnoreCase(platform)) { root.put("htmlLink", configService.get("index_html_link_ios")); } + + root.put("spikeGoods", getSpikeGoodsContent(acceptData)); out.print(JsonUtil.loadTrueResult(root)); } catch (Exception e) { @@ -1648,15 +1650,7 @@ return swiperList; } - /** - * 闄愭椂绉掓潃 1.5.3 - * - * @param acceptData - * @param out - */ - @RequestMapping(value = "getSpikeGoods") - public void getSpikeGoods(AcceptData acceptData, PrintWriter out) { - + private JSONObject getSpikeGoodsContent(AcceptData acceptData) { // 涓嬩竴娆″�掕鏃剁殑鏃堕棿 int type = qualityFlashSaleService.getNowType() + 1; int hour = 0; @@ -1734,10 +1728,30 @@ 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; + } + + /** + * 闄愭椂绉掓潃 1.5.3 + * + * @param acceptData + * @param out + */ + @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)); } @@ -1917,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); -- Gitblit v1.8.0