From 6367f20b7a8fe23d7a547b83f1e30321b84d09f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 02 七月 2019 09:38:35 +0800
Subject: [PATCH] 商品详情对象修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
index d52d0f7..efc60fb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
@@ -518,31 +518,17 @@
 	}
 
 	public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {
-		if (detail != null) {
+		if (detail != null && goods != null) {
 			// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
 			goods.setTitle(detail.getdTitle());
-			goods.setCouponAmount(detail.getQuanPrice());
-			goods.setZkPrice(detail.getOrgPrice());
-			if (new BigDecimal(detail.getQuanCondition()).compareTo(new BigDecimal(0)) > 0)
-				goods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getQuanCondition(),
-						MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice()).toString()));
-			else
-				goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", detail.getQuanPrice()));
 		}
 		return goods;
 	}
 
 	public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {
-		if (detail != null) {
+		if (detail != null && goods != null) {
 			// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
 			goods.setTitle(detail.getDtitle());
-			goods.setCouponAmount(detail.getCouponPrice());
-			goods.setZkPrice(detail.getOriginalPrice());
-			if (new BigDecimal(detail.getCouponConditions()).compareTo(new BigDecimal(0)) > 0)
-				goods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getCouponConditions(),
-						MoneyBigDecimalUtil.getWithNoZera(detail.getCouponPrice()).toString()));
-			else
-				goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", detail.getCouponPrice()));
 		}
 		return goods;
 	}

--
Gitblit v1.8.0