From d71ee3f3989dcf6848a4f40341111a2fd973f3ad Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:23:58 +0800
Subject: [PATCH] 动态分享修改 + 商品详情店铺链接

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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..65dbd68 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
@@ -2027,8 +2027,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 +2055,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