From efdac57e87ef0ca1a525d13bb5b742c560607ae2 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:14:36 +0800
Subject: [PATCH] 限时秒杀添加返回倒计时、详情加销量字段

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 f00a002..c62d7fa 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
@@ -1733,10 +1733,18 @@
 			// 缂撳瓨鍗婁釜灏忔椂
 			redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
 		}
-
+		Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
+		
+		JSONObject params = new JSONObject();
+		params.put("url", configService.get("spike_goods_link"));
+		JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+		
 		JSONObject root = new JSONObject();
 		root.put("time", nextTime.getTimeInMillis());
+		root.put("endTime", endTime > 0? endTime : 0);
 		root.put("listgoods", array);
+		root.put("params", params);
+		root.put("jumpDetail", jumpDetail);
 		out.print(JsonUtil.loadTrueResult(root));
 	}
 
@@ -1916,9 +1924,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);
@@ -2010,8 +2020,8 @@
 		goodsJson.put("hongBao", hongBao);
 
 		List<ClientTextStyleVO> labels = new ArrayList<>();
-		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
-		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
 		goodsJson.put("labels", labels);
 
 		data.put("tbPidInfo", clientTBPid);
@@ -2042,7 +2052,9 @@
 			}
 		}
 		// 搴楅摵
-		if ("android".equalsIgnoreCase(acceptData.getPlatform())&&Integer.parseInt(acceptData.getVersion()) >= 40) {
+		if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) >= 40)
+				|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
+						&& Integer.parseInt(acceptData.getVersion()) >= 49)) {
 			TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
 			if (shop != null)
 				goodsJson.put("shopInfo", shop);

--
Gitblit v1.8.0