From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 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..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
@@ -2,9 +2,12 @@
import java.math.BigDecimal;
+import com.yeshi.fanli.dto.jd.JDShopInfo;
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.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.goods.ShopInfoVO;
@@ -37,7 +40,7 @@
shopInfoVO.setGoodRatePercentage(shop.getGoodRatePercentage());
Integer shopType = shop.getUserType();
- if (shopType != null && shopType == 2) {
+ if (shopType != null && shopType == 1) {
shopInfoVO.setUserType(11); // 澶╃尗
} else {
shopInfoVO.setUserType(10); // 娣樺疂
@@ -55,6 +58,35 @@
shopInfoVO.setShopIcon(shopIconCustom);
} else {
shopInfoVO.setShopIcon(shop.getShopIcon());
+ }
+
+ String shopLink = shop.getShopLink();
+ if (StringUtil.isNullOrEmpty(shopLink))
+ shopLink = TaoBaoUtil.getShopLink(shop.getId());
+ shopInfoVO.setShopLink(shopLink);
+
+ 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;
}
@@ -76,8 +108,23 @@
shopInfoVO.setScoreSeller(new BigDecimal(goods.getAvgServ()));
shopInfoVO.setScoreLogistics(new BigDecimal(goods.getAvgLgst()));
shopInfoVO.setGoodRatePercentage(new BigDecimal(goods.getGoodsEvalScore()));
-// shopInfoVO.setShopIcon(shop.getShopIcon());
-// shopInfoVO.setShopLink(shop.getShopLink());
+ shopInfoVO.setShopLink("https://mobile.yangkeduo.com/mall_page.html?mall_id=" + goods.getMallId());
+ return shopInfoVO;
+ }
+
+ /**
+ * 鎷煎澶氬簵閾�
+ * @param goods 娣樺疂鍟嗗搧
+ * @param pid
+ * @param fanLiRate 杩斿埄姣斾緥
+ * @return
+ */
+ public static ShopInfoVO convertJDShop(JDShopInfo shopInfo) {
+ ShopInfoVO shopInfoVO = new ShopInfoVO();
+ shopInfoVO.setId(shopInfo.getShopId().toString());
+ shopInfoVO.setShopName(shopInfo.getShopName());
+ shopInfoVO.setUserType(20);
+ shopInfoVO.setShopLink("https://shop.m.jd.com/?shopId=" + shopInfo.getShopId());
return shopInfoVO;
}
}
--
Gitblit v1.8.0