From 21c1c197ec0dba6da332bf4119c262267dcfb191 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 五月 2020 10:29:03 +0800
Subject: [PATCH] 粉丝信息同步调整

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
index 6812e2a..d8078f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java
@@ -4,6 +4,7 @@
 import java.util.Date;
 
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.order.CommonOrderGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -53,12 +54,31 @@
 		if (jdGoods.getImageList() != null && jdGoods.getImageList().size() > 0)
 			goods.setPicture(jdGoods.getImageList().get(0));
 		goods.setPrice(jdGoods.getPrice());
-		goods.setShopId((long) jdGoods.getShopInfo().getShopId());
-		goods.setShopName(jdGoods.getShopInfo().getShopName());
+		if (jdGoods.getShopInfo() != null) {
+			goods.setShopId((long) jdGoods.getShopInfo().getShopId());
+			goods.setShopName(jdGoods.getShopInfo().getShopName());
+		}
 		goods.setShopType(jdGoods.getOwner());
 		goods.setState(0);
 		goods.setTitle(jdGoods.getSkuName());
 		return goods;
 	}
 
+	public static CommonOrderGoods create(VIPGoodsInfo vipGoods) {
+		CommonOrderGoods goods = new CommonOrderGoods();
+		goods.setGoodsId(vipGoods.getGoodsId() + "");
+		goods.setCreateTime(new Date());
+		goods.setGoodsType(Constant.SOURCE_TYPE_VIP);
+		goods.setPicture(vipGoods.getGoodsMainPicture());
+		goods.setPrice(new BigDecimal(vipGoods.getVipPrice()));
+		if (vipGoods.getBrandId() != null) {
+			goods.setShopId(vipGoods.getBrandId());
+			goods.setShopName(vipGoods.getBrandName());
+		}
+		goods.setShopType("鍞搧浼�");
+		goods.setState(0);
+		goods.setTitle(vipGoods.getGoodsName());
+		return goods;
+	}
+
 }

--
Gitblit v1.8.0