From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java |   12 +++++++++---
 1 files changed, 9 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 f9121fe..5e4f235 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
@@ -8,9 +8,10 @@
 import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.order.CommonOrderGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
 
 public class CommonOrderGoodsFactory {
 
@@ -89,7 +90,12 @@
 		goods.setGoodsType(Constant.SOURCE_TYPE_SUNING);
 		if (suningGoods.getCommodityInfo().getPictureUrl().size() > 0)
 			goods.setPicture(suningGoods.getCommodityInfo().getPictureUrl().get(0).getPicUrl());
-		goods.setPrice(new BigDecimal(suningGoods.getCommodityInfo().getCommodityPrice()));
+		
+		String commodityPrice = suningGoods.getCommodityInfo().getCommodityPrice();
+		if (StringUtil.isNullOrEmpty(commodityPrice)) {
+			commodityPrice = suningGoods.getCommodityInfo().getSnPrice();
+		}
+		goods.setPrice(new BigDecimal(commodityPrice));
 		goods.setShopId(Long.parseLong(suningGoods.getCommodityInfo().getSupplierCode()));
 		goods.setShopName(suningGoods.getCommodityInfo().getSupplierName());
 		goods.setShopType("鑻忓畞");

--
Gitblit v1.8.0