From 54ae34b91644b02c422b41197ae6ce33f4e3ca57 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 十月 2019 13:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java
index b75e45c..168b74e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java
@@ -7,6 +7,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.vo.goods.ShopInfoVO;
 
 
@@ -58,6 +59,12 @@
 		} else {
 			shopInfoVO.setShopIcon(shop.getShopIcon());
 		}
+		
+		String shopLink = shop.getShopLink();
+		if (StringUtil.isNullOrEmpty(shopLink))
+			shopLink = TaoBaoUtil.getShopLink(shop.getId());
+		shopInfoVO.setShopLink(shopLink);
+		
 		return shopInfoVO;
 	}
 	

--
Gitblit v1.8.0