From 0a63d22e38a644bc83b393ed85618b04d3be858b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:22:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
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