From 94e043b0d3fabe60dabce6df28b2ee6a1df7114e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 20 五月 2019 15:03:16 +0800
Subject: [PATCH] 首页限时秒杀接口更改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 fa5cee8..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));
}
@@ -2027,8 +2028,6 @@
goodsJson.put("hongBao", hongBao);
List<ClientTextStyleVO> labels = new ArrayList<>();
- labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
- labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
goodsJson.put("labels", labels);
data.put("tbPidInfo", clientTBPid);
@@ -2057,19 +2056,30 @@
} else {
tbShopInfo.setUserType("0");
}
+
+ String shopLink = tbShopInfo.getShopUrl();
+ if (StringUtil.isNullOrEmpty(shopLink)) {
+ tbShopInfo.setShopUrl(TaoBaoUtil.getShopLink(tbShopInfo.getUserId()));
+ }
}
+
// 搴楅摵
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)
+ if (shop != null) {
+ String shopLink = shop.getShopLink();
+ if (StringUtil.isNullOrEmpty(shopLink)) {
+ shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
+ }
goodsJson.put("shopInfo", shop);
+ }
} else {
goodsJson.put("shopInfo", tbShopInfo);
}
- goodsJson.put("fanliValid",Math.random()>0.5? true:false);// 鏄惁鏈夎繑鍒�
+ goodsJson.put("fanliValid",true);// 鏄惁鏈夎繑鍒�
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
--
Gitblit v1.8.0