From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 九月 2019 16:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 05373b6..b0b2065 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
@@ -4,6 +4,7 @@
 
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
+import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.vo.goods.ShopInfoVO;
 
@@ -59,6 +60,29 @@
 		return shopInfoVO;
 	}
 	
+
+	/**
+	 * 娣樺疂搴楅摵
+	 * @param goods 娣樺疂鍟嗗搧
+	 * @param pid
+	 * @param fanLiRate 杩斿埄姣斾緥
+	 * @return
+	 */
+	public static ShopInfoVO convertTaoBaoShop(TaoBaoShopInfo shop) {
+		ShopInfoVO shopInfoVO = new ShopInfoVO();
+		shopInfoVO.setId(shop.getUserId().toString());
+		shopInfoVO.setShopName(shop.getShopTitle());
+		shopInfoVO.setShopIcon(shop.getPictureUrl());
+		shopInfoVO.setShopLink(shop.getShopUrl());
+		String shopType = shop.getShopType();
+		if (shopType != null && "B".equalsIgnoreCase(shopType)) {
+			shopInfoVO.setUserType(11); // 澶╃尗
+		} else {
+			shopInfoVO.setUserType(10); // 娣樺疂
+		}
+		return shopInfoVO;
+	}
+	
 	
 	/**
 	 * 鎷煎澶氬簵閾�

--
Gitblit v1.8.0