From b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 10:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonOrderGoodsFactory.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..af51f54 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
@@ -11,6 +11,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.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