From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 1fff6de..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
@@ -35,7 +35,7 @@
goods.setGoodsId(detail.getGoodsId() + "");
goods.setCreateTime(new Date());
goods.setGoodsType(Constant.SOURCE_TYPE_PDD);
- goods.setPicture(detail.getGoodsImageUrl());
+ goods.setPicture(detail.getGoodsThumbnailUrl());
goods.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(detail.getMinNormalPrice()), new BigDecimal(100)));
goods.setShopId(detail.getMallId());
goods.setShopName(detail.getMallName());
@@ -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