From aa552facf6d833acab0d3e3e29bda2a0fb826ffe Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 25 十一月 2019 16:14:13 +0800 Subject: [PATCH] 品牌缓存生效 --- fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 73 ++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 21 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..59888c1 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 @@ -1,7 +1,9 @@ package com.yeshi.fanli.util.dataoke; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -213,7 +215,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 +248,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 +282,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 +316,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 +347,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())); @@ -358,14 +360,46 @@ } 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; + } + + private static String requestGet(String url, Map<String, String> params) { + Iterator<String> keys = params.keySet().iterator(); + url += "?"; + while (keys.hasNext()) { + String key = keys.next(); + try { + url += String.format("%s=%s&", key, URLEncoder.encode(params.get(key), "UTF-8")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + return HttpUtil.get(url, 10000); + } 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,10 +419,10 @@ 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<>()); + String result = requestGet("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params); JSONObject json = JSONObject.fromObject(result); JSONObject dataJson = json.optJSONObject("data"); @@ -489,7 +523,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 +544,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 +576,6 @@ return detail; } - /** * 鍚勫ぇ姒滃崟 * @@ -556,14 +588,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 +606,7 @@ } return hotWords; } - - + class DaTaoKeResult { Date updateTime; List<DaTaoKeDetail> dataList; -- Gitblit v1.8.0