From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/ShopInfoVOFactory.java | 22 +++++++++++++++++++---
1 files changed, 19 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 b0b2065..b75e45c 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,6 +2,7 @@
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;
@@ -38,7 +39,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); // 娣樺疂
@@ -100,8 +101,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