From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 07c841a..93f8b30 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
@@ -2027,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);
@@ -2057,19 +2057,29 @@
} 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", true);// 鏄惁鏈夎繑鍒�
+ goodsJson.put("fanliValid",Math.random()>0.5? true:false);// 鏄惁鏈夎繑鍒�
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
@@ -2087,6 +2097,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