From aba5dee7a341ecb60fe02f088684aa982ac037f9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 11 六月 2019 09:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 3896412..4c74dc1 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
@@ -5,8 +5,6 @@
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import org.jsoup.Jsoup;
@@ -20,10 +18,10 @@
import com.yeshi.fanli.entity.taobao.TaoBaoHead;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -523,13 +521,32 @@
if (detail != null) {
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
goods.setTitle(detail.getdTitle());
- goods.setCouponAmount(detail.getQuanPrice());
+ 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(detail.getQuanPrice()).toString()));
+ MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString()));
else
- goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", detail.getQuanPrice()));
+ goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", goods.getCouponAmount()));
+ }
+ return goods;
+ }
+
+ public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {
+ if (detail != 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()));
}
return goods;
}
--
Gitblit v1.8.0