From 32f925357776c46bd9e35cf9aad4fdd0f6535d1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十月 2019 09:21:35 +0800
Subject: [PATCH] 订单奖励修改
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 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 6bb2c43..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()));
@@ -360,12 +360,12 @@
}
public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
- BigDecimal priceUpperLimit, int page, int pageSize, int sort) {
+ BigDecimal priceUpperLimit, int page, int pageSize, Integer sort) {
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 + "");
@@ -385,7 +385,8 @@
params.put("cids", cids);
params.put("keyWords", key);
- params.put("sort", sort + "");
+ if (sort != null)
+ params.put("sort", sort + "");
params.put("sign", getSign(params, app.getAppSecret()));
String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params,
new HashMap<>());
@@ -489,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)
@@ -510,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) {
@@ -543,7 +543,6 @@
return detail;
}
-
/**
* 鍚勫ぇ姒滃崟
*
@@ -556,14 +555,14 @@
params.put("version", "v1.0.1");
params.put("appKey", app.getAppKey());
params.put("sign", getSign(params, app.getAppSecret()));
-
+
String result = null;
try {
result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
} catch (Exception e) {
result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());
}
-
+
String hotWords = null;
JSONObject json = JSONObject.fromObject(result);
if (json != null) {
@@ -574,8 +573,7 @@
}
return hotWords;
}
-
-
+
class DaTaoKeResult {
Date updateTime;
List<DaTaoKeDetail> dataList;
--
Gitblit v1.8.0