From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 385 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 293 insertions(+), 92 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 4c81d5f..6c84500 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,8 +1,9 @@ package com.yeshi.fanli.util.dataoke; import java.io.IOException; -import java.lang.reflect.Type; +import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -21,18 +22,18 @@ import org.jsoup.select.Elements; import org.yeshi.utils.HttpUtil; +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.yeshi.fanli.dto.dataoke.DaTaoKeApiResult; +import com.google.gson.GsonBuilder; import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult; import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoKeAppInfo; -import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail; import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2; -import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; +import com.yeshi.fanli.util.TimeUtil; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -62,7 +63,20 @@ final static String[] APP_SECRETS = new String[] { APP_KEY_SECRET, APP_KEY_SECRET_2 }; - static Gson gson = new Gson(); + static Gson gson = null; + static { + gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() { + @Override + public boolean shouldSkipField(FieldAttributes f) { + return f.getName().equals("createTime");// 蹇界暐createTime鐨勮В鏋� + } + + @Override + public boolean shouldSkipClass(Class<?> clazz) { + return false; + } + }).create(); + } private static String get(String url) { HttpClient client = new HttpClient(); @@ -97,27 +111,6 @@ } return result; - } - - public static DaTaoKeApiResult goodsList(int page) { - List<DaTaoKeDetail> list = new ArrayList<>(); - String url = String.format("http://api.dataoke.com/index.php?r=Port/index&type=total&appkey=%s&v=2&page=%s", - Math.random() > 0.5 ? API_KEY : API_KEY_2, page + ""); - String result = request(url); - - JSONObject resultJson = JSONObject.fromObject(result); - System.out.println(resultJson); - JSONArray array = resultJson.optJSONArray("result"); - for (int i = 0; i < array.size(); i++) { - list.add(gson.fromJson(array.optJSONObject(i).toString(), DaTaoKeDetail.class)); - } - - for (DaTaoKeDetail dt : list) - if (!dt.getPic().startsWith("http")) - dt.setPic("https:" + dt.getPic()); - - return new DaTaoKeApiResult(resultJson.optJSONObject("data").optInt("total_num"), - resultJson.optJSONObject("data").optString("update_time"), list); } /** @@ -167,11 +160,12 @@ 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); - + // 鍟嗗搧淇℃伅 taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO); - + break; } } @@ -190,7 +184,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"); @@ -204,11 +198,7 @@ if (dataJson != null) { JSONArray array = dataJson.optJSONArray("list"); if (array != null) { - String data = array.toString(); - Type type = new TypeToken<List<DaTaoKeDetailV2>>() { - }.getType(); - - List<DaTaoKeDetailV2> list = gson.fromJson(data, type); + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); daTaoKeGoodsResult.setGoodsList(list); } daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); @@ -227,7 +217,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)) @@ -248,11 +238,7 @@ if (dataJson != null) { JSONArray array = dataJson.optJSONArray("list"); if (array != null) { - String data = array.toString(); - Type type = new TypeToken<List<DaTaoKeDetailV2>>() { - }.getType(); - - List<DaTaoKeDetailV2> list = gson.fromJson(data, type); + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); daTaoKeGoodsResult.setGoodsList(list); } daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); @@ -265,7 +251,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)) @@ -285,11 +271,8 @@ if (dataJson != null) { JSONArray array = dataJson.optJSONArray("list"); if (array != null) { - String data = array.toString(); - Type type = new TypeToken<List<DaTaoKeDetailV2>>() { - }.getType(); - List<DaTaoKeDetailV2> list = gson.fromJson(data, type); + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); daTaoKeGoodsResult.setGoodsList(list); } daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); @@ -302,7 +285,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)) @@ -321,11 +304,7 @@ if (dataJson != null) { JSONArray array = dataJson.optJSONArray("list"); if (array != null) { - String data = array.toString(); - Type type = new TypeToken<List<DaTaoKeDetailV2>>() { - }.getType(); - - List<DaTaoKeDetailV2> list = gson.fromJson(data, type); + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); daTaoKeGoodsResult.setGoodsList(list); } daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); @@ -336,9 +315,8 @@ public static DaTaoKeDetailV2 getGoodsDetail(Long id) { 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("id", id + ""); params.put("sign", getSign(params, app.getAppSecret())); @@ -347,18 +325,50 @@ JSONObject json = JSONObject.fromObject(result); JSONObject dataJson = json.optJSONObject("data"); if (dataJson != null) { - return gson.fromJson(dataJson.toString(), DaTaoKeDetailV2.class); + return parseDaTaoKeDetailV2(dataJson); } 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 + ""); @@ -377,22 +387,132 @@ if (!StringUtil.isNullOrEmpty(cids)) params.put("cids", cids); + if (StringUtil.isNullOrEmpty(key)) + key = ""; 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"); if (dataJson != null) { JSONArray array = dataJson.optJSONArray("list"); if (array != null) { - String data = array.toString(); - Type type = new TypeToken<List<DaTaoKeDetailV2>>() { - }.getType(); + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); + daTaoKeGoodsResult.setGoodsList(list); + } + daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); + daTaoKeGoodsResult.setTotalCount(dataJson.optLong("totalNum")); + } + return daTaoKeGoodsResult; + } - List<DaTaoKeDetailV2> list = gson.fromJson(data, type); + public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit, + BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int page, int pageSize, Integer sort) { + + TaoKeAppInfo app = getRandomApp(); + DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult(); + Map<String, String> params = new TreeMap<>(); + params.put("version", "v2.1.0"); + params.put("appKey", app.getAppKey()); + params.put("pageSize", pageSize + ""); + params.put("pageId", page + ""); + if (priceLowerLimit != null) + params.put("priceLowerLimit", priceLowerLimit + ""); + if (priceUpperLimit != null) + params.put("priceUpperLimit", priceUpperLimit + ""); + + if (couponPriceLowerLimit != null) + params.put("couponPriceLowerLimit", couponPriceLowerLimit + ""); + + String cids = ""; + if (cidList != null && cidList.size() > 0) + for (Integer cid : cidList) { + cids += cid + ","; + } + + if (cids.endsWith(",")) + cids = cids.substring(0, cids.length() - 1); + if (!StringUtil.isNullOrEmpty(cids)) + params.put("cids", cids); + + if (StringUtil.isNullOrEmpty(key)) + key = "%"; + params.put("keyWords", key); + + if (sort != null) + params.put("sort", sort + ""); + params.put("sign", getSign(params, app.getAppSecret())); + String result = requestGet("https://openapi.dataoke.com/api/goods/get-dtk-search-goods", params); + + JSONObject json = JSONObject.fromObject(result); + JSONObject dataJson = json.optJSONObject("data"); + if (dataJson != null) { + JSONArray array = dataJson.optJSONArray("list"); + if (array != null) { + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); + daTaoKeGoodsResult.setGoodsList(list); + } + daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); + daTaoKeGoodsResult.setTotalCount(dataJson.optLong("totalNum")); + } + return daTaoKeGoodsResult; + } + + /** + * 鍟嗗搧鍒楄〃 + * + * @param key + * @param cidList + * @param priceLowerLimit + * @param priceUpperLimit + * @param couponPriceLowerLimit + * @param pageId + * @param pageSize + * @param sort + * @return + */ + public static DaTaoKeGoodsResult getGoodsList(String key, List<Integer> cidList, BigDecimal priceLowerLimit, + BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int pageId, int pageSize, Integer sort) { + TaoKeAppInfo app = getRandomApp(); + DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult(); + Map<String, String> params = new TreeMap<>(); + params.put("version", "v1.1.0"); + params.put("appKey", app.getAppKey()); + params.put("pageSize", pageSize + ""); + params.put("pageId", pageId + ""); + + if (priceLowerLimit != null) + params.put("priceLowerLimit", priceLowerLimit + ""); + if (priceUpperLimit != null) + params.put("priceUpperLimit", priceUpperLimit + ""); + + if (couponPriceLowerLimit != null) + params.put("couponPriceLowerLimit", couponPriceLowerLimit + ""); + + if (sort != null) + params.put("sort", sort + ""); + + if (cidList != null && cidList.size() > 0) { + String cids = ""; + for (int cid : cidList) + cids += cid + ","; + cids = cids.endsWith(",") ? cids.substring(0, cids.length() - 1) : cids; + + params.put("cids", cids + ""); + } + + params.put("sign", getSign(params, app.getAppSecret())); + String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-list", params, new HashMap<>()); + JSONObject json = JSONObject.fromObject(result); + JSONObject dataJson = json.optJSONObject("data"); + if (dataJson != null) { + JSONArray array = dataJson.optJSONArray("list"); + if (array != null) { + List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array); daTaoKeGoodsResult.setGoodsList(list); } daTaoKeGoodsResult.setPageId(dataJson.optString("pageId")); @@ -418,7 +538,6 @@ return StringUtil.Md5(signStr).toUpperCase(); } - /** * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁� * @@ -429,20 +548,20 @@ if (brandId == null) { return taoBaoShopDTO; } - + int userType = 0; List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>(); - - String result = HttpUtil.get("http://www.dataoke.com/brandGoods?id=" + brandId +"&page=1"); + + String result = HttpUtil.get("http://www.dataoke.com/brandGoods?id=" + brandId + "&page=1"); JSONObject json = JSONObject.fromObject(result); JSONArray arrayGoods = json.optJSONArray("goods"); - + for (int i = 0; i < arrayGoods.size(); i++) { if (i >= 2) { break; } JSONObject itemGoods = arrayGoods.optJSONObject(i); - + TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief(); taoBaoGoods.setAuctionId(itemGoods.optLong("goodsid")); taoBaoGoods.setBiz30day(itemGoods.optInt("xiaoliang")); @@ -471,11 +590,11 @@ taoBaoShopDTO.setListGoods(listGoods); return taoBaoShopDTO; } - 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;// 澶嶈喘姒� /** * 鍚勫ぇ姒滃崟 @@ -483,16 +602,23 @@ * @param type * @return */ - public static DaTaoKeGoodsResult getRankingList(int type) { + public static DaTaoKeGoodsResult getRankingList(int type, Integer cid) { 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<>()); - LogHelper.test("getRankingList:" + result); + // 鍋�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"); @@ -500,31 +626,106 @@ List<DaTaoKeDetailV2> list = new ArrayList<>(); for (int i = 0; i < array.size(); i++) { JSONObject itemData = array.optJSONObject(i); - DaTaoKeDetailV2 item = gson.fromJson(itemData.toString(), DaTaoKeDetailV2.class); - item.setCouponConditions(itemData.optString("quanUsageCondition")); - item.setShopType(itemData.optInt("istmall")); - item.setOriginalPrice(new BigDecimal(itemData.optString("originPrice"))); - item.setMainPic(itemData.optString("pic")); + DaTaoKeDetailV2 item = parseDaTaoKeDetailV2(itemData); + 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; - } - class DaTaoKeResult { - Date updateTime; - List<DaTaoKeDetail> dataList; - - public DaTaoKeResult(Date updateTime, List<DaTaoKeDetail> dataList) { - this.updateTime = updateTime; - this.dataList = dataList; + private static List<DaTaoKeDetailV2> parseDaTaoKeDetailV2List(JSONArray array) { + List<DaTaoKeDetailV2> detailList = new ArrayList<>(); + for (int i = 0; i < array.size(); i++) { + DaTaoKeDetailV2 detail = parseDaTaoKeDetailV2(array.optJSONObject(i)); + detailList.add(detail); } - - public DaTaoKeResult() { - - } + return detailList; } + private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) { + DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class); + 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; + } + + /** + * 楂樻晥杞摼 + * @Title: convertLink + * @Description: + * @param auctionId + * @param pid + * void 杩斿洖绫诲瀷 + * @throws + */ + public static String convertLink(Long auctionId, String pid) { + TaoKeAppInfo app = APP_KEYS[1]; + Map<String, String> params = new TreeMap<>(); + params.put("version", "v1.1.1"); + params.put("goodsId", auctionId + ""); + params.put("pid", pid); + params.put("appKey", app.getAppKey()); + params.put("sign", getSign(params, app.getAppSecret())); + + String result = null; + try { + result = HttpUtil.get("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params, + new HashMap<>()); + } catch (Exception e) { + result = HttpUtil.get("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params, + new HashMap<>()); + } + + System.out.println(result); + + JSONObject json = JSONObject.fromObject(result); + if (json != null) { + json = json.getJSONObject("data"); + if (json != null) { + return json.optString("couponClickUrl"); + } + } + return null; + } } -- Gitblit v1.8.0