From 5046ecde3cd849511a337e25e13af7df7f1894bc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 42260ef..a93d81d 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
@@ -560,4 +560,19 @@
 		return goods;
 	}
 
+	public static DaTaoKeDetail filterDaTaoKe(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {
+		if (goods != null) {
+			BigDecimal price = TaoBaoUtil.getAfterUseCouplePrice(goods);
+			detail.setOrgPrice(goods.getZkPrice());
+			detail.setPrice(price);
+			if (goods.getCouponStartFee() != null)
+				detail.setQuanCondition(goods.getCouponStartFee() + "");
+			detail.setQuanId(goods.getCouponActivityId());
+			detail.setQuanPrice(goods.getCouponAmount());
+			return detail;
+		}
+
+		return detail;
+	}
+
 }

--
Gitblit v1.8.0