From 20d1a38a0f8049873f1fbbaef96c22e971ea9d77 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 15:50:09 +0800
Subject: [PATCH] 搜索词

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java |   26 ++++++--------------------
 1 files changed, 6 insertions(+), 20 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 4c74dc1..81a08be 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,35 +518,21 @@
 	}
 
 	public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {
-		if (detail != null) {
+		if (detail != null && goods != null) {
 			// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
 			goods.setTitle(detail.getdTitle());
-			if (goods.getCouponAmount() != null && detail.getQuanPrice() != null
-					&& goods.getCouponAmount().compareTo(detail.getQuanPrice()) < 0)
-				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(goods.getCouponAmount()).toString()));
-			else
-				goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", goods.getCouponAmount()));
+			if (!StringUtil.isNullOrEmpty(detail.getPic()))
+				goods.setPictUrlWhite(detail.getPic());
 		}
 		return goods;
 	}
 
 	public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {
-		if (detail != null) {
+		if (detail != null && goods != null) {
 			// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
 			goods.setTitle(detail.getDtitle());
-			if (goods.getCouponAmount() != null && detail.getCouponPrice() != null
-					&& goods.getCouponAmount().compareTo(detail.getCouponPrice()) < 0)
-				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(goods.getCouponAmount()).toString()));
-			else
-				goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", goods.getCouponAmount()));
+			if (!StringUtil.isNullOrEmpty(detail.getMainPic()))
+				goods.setPictUrlWhite(detail.getMainPic());
 		}
 		return goods;
 	}

--
Gitblit v1.8.0