From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
index 9ee6577..7630a3d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
@@ -213,7 +213,7 @@
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v1.1.0");
params.put("appKey", app.getAppKey());
params.put("pageSize", 200 + "");
// params.put("sort", "1");
@@ -246,7 +246,7 @@
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v1.0.1");
params.put("appKey", app.getAppKey());
params.put("pageSize", 200 + "");
if (!StringUtil.isNullOrEmpty(startTime))
@@ -280,7 +280,7 @@
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v1.1.0");
params.put("appKey", app.getAppKey());
params.put("pageSize", 200 + "");
if (!StringUtil.isNullOrEmpty(startTime))
@@ -314,7 +314,7 @@
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v1.1.0");
params.put("appKey", app.getAppKey());
params.put("pageSize", 200 + "");
if (!StringUtil.isNullOrEmpty(startTime))
@@ -345,7 +345,7 @@
public static DaTaoKeDetailV2 getGoodsDetail(Long id) {
TaoKeAppInfo app = getRandomApp();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v1.1.0");
params.put("appKey", app.getAppKey());
params.put("id", id + "");
params.put("sign", getSign(params, app.getAppSecret()));
@@ -365,7 +365,7 @@
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v2.1.0");
params.put("appKey", app.getAppKey());
params.put("pageSize", pageSize + "");
params.put("pageId", page + "");
@@ -490,7 +490,7 @@
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
- params.put("version", "v1.0.0");
+ params.put("version", "v1.1.0");
params.put("appKey", app.getAppKey());
params.put("rankType", type + "");
if (cid != null)
@@ -511,16 +511,15 @@
for (int i = 0; i < array.size(); i++) {
JSONObject itemData = array.optJSONObject(i);
DaTaoKeDetailV2 item = parseDaTaoKeDetailV2(itemData);
- item.setCouponConditions(itemData.optString("quanUsageCondition"));
- item.setShopType(itemData.optInt("istmall"));
- item.setOriginalPrice(new BigDecimal(itemData.optString("originPrice")));
- item.setMainPic(itemData.optString("pic"));
+ item.setCouponConditions(itemData.optString("couponConditions"));
+ item.setShopType(itemData.optInt("shopType"));
+ item.setOriginalPrice(new BigDecimal(itemData.optString("originalPrice")));
+ item.setMainPic(itemData.optString("mainPic"));
list.add(item);
}
daTaoKeGoodsResult.setGoodsList(list);
}
return daTaoKeGoodsResult;
-
}
private static List<DaTaoKeDetailV2> parseDaTaoKeDetailV2List(JSONArray array) {
--
Gitblit v1.8.0