From 7912a94e5de72b628bde39b16e6c7b21172910eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:15:39 +0800
Subject: [PATCH] 2.1.2bug

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 e753719..edfd68d 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
@@ -979,8 +979,13 @@
 		goodsInfo.setPriceName("鍘熶环");
 		if (goods.getCommodityInfo().getPictureUrl().size() > 0)
 			goodsInfo.setPicUrl(goods.getCommodityInfo().getPictureUrl().get(0).getPicUrl()); // 缂╃暐鍥�
-		goodsInfo.setZkPrice(
-				MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(goods.getCommodityInfo().getCommodityPrice())));
+	
+		
+		String commodityPrice = goods.getCommodityInfo().getCommodityPrice();
+		if (StringUtil.isNullOrEmpty(commodityPrice)) {
+			commodityPrice = goods.getCommodityInfo().getSnPrice();
+		}
+		goodsInfo.setZkPrice(MoneyBigDecimalUtil.getWithNoZera(new BigDecimal(commodityPrice)));
 		goodsInfo.setShopType(CommonGoods.SHOP_TYPE_SUNING);
 
 		List<String> imgList = new ArrayList<>();
@@ -1050,7 +1055,7 @@
 			moneyInfoVO
 					.setMaxMoney("楼" + commission.add(MoneyBigDecimalUtil.mul(commission, params.getMaxRewardRate())));
 		else {
-			BigDecimal price = new BigDecimal(goods.getCommodityInfo().getCommodityPrice());
+			BigDecimal price = new BigDecimal(commodityPrice);
 			BigDecimal rate = MoneyBigDecimalUtil.div(commission.multiply(new BigDecimal(100)), price);
 			moneyInfoVO.setRateInfo("杩斿埄姣� " + rate + "%");
 

--
Gitblit v1.8.0