From 64d96fd02c487ff70b6d342534b2fb79089d35ba Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 20 十一月 2019 18:01:34 +0800
Subject: [PATCH] 红包领取加入唯一标识
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 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 aa0839f..a931a21 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
@@ -189,6 +189,7 @@
taoBaoShopDTO.setSellerId(item.optLong("seller_id"));
taoBaoShopDTO.setBrandId(item.optString("brand_id"));
taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
+ taoBaoShopDTO.setShopIcon(item.optString("brand_logo"));
taoBaoShopDTO.setUserType(0);
// 鍟嗗搧淇℃伅
@@ -212,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");
@@ -245,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))
@@ -279,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))
@@ -313,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))
@@ -344,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()));
@@ -357,14 +358,32 @@
}
return null;
}
+
+ public static DaTaoKeDetailV2 getGoodsDetailByGoodsId(Long goodsId) {
+ TaoKeAppInfo app = getRandomApp();
+ Map<String, String> params = new TreeMap<>();
+ params.put("version", "v1.1.1");
+ params.put("appKey", app.getAppKey());
+ params.put("goodsId", goodsId + "");
+ params.put("sign", getSign(params, app.getAppSecret()));
+ String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,
+ new HashMap<>());
+ System.out.println(result);
+ JSONObject json = JSONObject.fromObject(result);
+ JSONObject dataJson = json.optJSONObject("data");
+ if (dataJson != null) {
+ return parseDaTaoKeDetailV2(dataJson);
+ }
+ return null;
+ }
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 + "");
@@ -384,7 +403,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<>());
@@ -476,6 +496,7 @@
public static int RANK_TYPE_TIME = 1;// 瀹炴椂
public static int RANK_TYPE_DAY = 2;// 鍏ㄥぉ姒�
public static int RANK_TYPE_HOT = 3;// 鐑帹姒�
+ public static int RANK_TYPE_REBUY = 4;// 澶嶈喘姒�
/**
* 鍚勫ぇ姒滃崟
@@ -487,13 +508,19 @@
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)
params.put("cid", cid + "");
params.put("sign", getSign(params, app.getAppSecret()));
- String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+ // 鍋�2娆¤姹�
+ String result = null;
+ try {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+ } catch (Exception e) {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+ }
JSONObject json = JSONObject.fromObject(result);
if (json != null) {
JSONArray array = json.optJSONArray("data");
@@ -502,16 +529,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) {
@@ -525,8 +551,45 @@
private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) {
DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
- detail.setCreateTime(new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+ if (StringUtil.isNullOrEmpty(json.optString("createTime"))) {
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(json.optString("onSaleTime"), "yyyy-MM-dd HH:mm:ss")));
+ } else {
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+ }
return detail;
+ }
+
+ /**
+ * 鍚勫ぇ姒滃崟
+ *
+ * @param type
+ * @return
+ */
+ public static String getHotWords() {
+ TaoKeAppInfo app = getRandomApp();
+ Map<String, String> params = new TreeMap<>();
+ 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) {
+ json = json.getJSONObject("data");
+ if (json != null) {
+ hotWords = json.optString("hotWords");
+ }
+ }
+ return hotWords;
}
class DaTaoKeResult {
@@ -542,5 +605,4 @@
}
}
-
}
--
Gitblit v1.8.0