From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改,爬单新规则添加

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java |    6 ++++--
 1 files changed, 4 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..950f2f7 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
@@ -53,8 +53,10 @@
 		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());

--
Gitblit v1.8.0