From 89e89fe2b2a1578a94b2e2c8ee81efbfbbf85f08 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 14:18:42 +0800
Subject: [PATCH] 兑换邀请码调整
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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..d8b914e 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
@@ -374,7 +374,7 @@
List<DingDongQiangDTO> list = new ArrayList<>();
Document doc = null;
try {
- doc = Jsoup.connect("http://www.dataoke.com/ddq").get();
+ doc = Jsoup.connect("http://www.dataoke.com/ddq").userAgent("").get();
} catch (IOException e1) {
e1.printStackTrace();
}
@@ -395,9 +395,11 @@
for (Iterator<String> its = dataJson.keys(); its.hasNext();) {
String key = its.next();
JSONArray array = dataJson.optJSONArray(key);
- List<DaTaoKeDetail> detailList = new ArrayList<>();
+ List<DaTaoKeDetailV2> detailList = new ArrayList<>();
for (int n = 0; n < array.size(); n++) {
- detailList.add(new DaTaoKeDetail(array.optJSONObject(n).optLong("id")));
+ DaTaoKeDetailV2 v2 = new DaTaoKeDetailV2();
+ v2.setId(array.optJSONObject(n).optLong("id"));
+ detailList.add(v2);
}
list.add(new DingDongQiangDTO(key, detailList));
}
@@ -560,4 +562,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