From b44f60ae27bbe0b7aec29414c629747b7755e964 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 09 十月 2019 09:52:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..9ee6577 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
@@ -360,7 +360,7 @@
}
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();
@@ -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<>());
@@ -543,7 +544,6 @@
return detail;
}
-
/**
* 鍚勫ぇ姒滃崟
*
@@ -556,14 +556,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 +574,7 @@
}
return hotWords;
}
-
-
+
class DaTaoKeResult {
Date updateTime;
List<DaTaoKeDetail> dataList;
--
Gitblit v1.8.0