From 616608ec1005bff373bc380ecc3bf02a1063497c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 13d3adc..4b00739 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -133,7 +133,12 @@
goodsInfo.setGoodsType(goodsType);
goodsInfo.setZkPrice(goods.getPrice());
- goodsInfo.setState(goods.getState());
+ Integer state = goods.getState();
+ if (state == null) {
+ goodsInfo.setState(0);
+ } else {
+ goodsInfo.setState(goods.getState());
+ }
goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getSales()));
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
--
Gitblit v1.8.0