From 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 16:10:45 +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 | 195 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 148 insertions(+), 47 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 9c9391e..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
@@ -1,7 +1,6 @@
package com.yeshi.fanli.util.dataoke;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
@@ -21,8 +20,10 @@
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.google.gson.GsonBuilder;
import com.yeshi.fanli.dto.dataoke.DaTaoKeApiResult;
import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;
@@ -32,6 +33,7 @@
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
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;
@@ -61,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();
@@ -119,6 +134,14 @@
resultJson.optJSONObject("data").optString("update_time"), list);
}
+ public static DaTaoKeDetail getGoodsDetailV1(Long id) {
+ String url = String.format("http://api.dataoke.com/index.php?r=Port/index&type=total&appkey=%s&v=2&id=%s",
+ Math.random() > 0.5 ? API_KEY : API_KEY_2, id + "");
+ String result = request(url);
+ JSONObject resultJson = JSONObject.fromObject(result);
+ return gson.fromJson(resultJson.optJSONArray("result").optJSONObject(0).toString(), DaTaoKeDetail.class);
+ }
+
/**
* 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
*
@@ -166,11 +189,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;
}
}
@@ -189,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");
@@ -203,11 +227,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"));
@@ -226,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))
@@ -247,11 +267,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"));
@@ -264,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))
@@ -284,11 +300,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"));
@@ -301,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))
@@ -320,11 +333,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"));
@@ -335,9 +344,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()));
@@ -346,18 +354,18 @@
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 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,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<>());
@@ -387,11 +396,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"));
@@ -417,7 +422,6 @@
return StringUtil.Md5(signStr).toUpperCase();
}
-
/**
* 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
*
@@ -428,20 +432,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"));
@@ -470,7 +474,105 @@
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;// 澶嶈喘姒�
+
+ /**
+ * 鍚勫ぇ姒滃崟
+ *
+ * @param type
+ * @return
+ */
+ 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.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()));
+ // 鍋�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");
+
+ List<DaTaoKeDetailV2> list = new ArrayList<>();
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject itemData = array.optJSONObject(i);
+ 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;
+ }
+
+ 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);
+ }
+ 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;
+ }
class DaTaoKeResult {
Date updateTime;
@@ -485,5 +587,4 @@
}
}
-
}
--
Gitblit v1.8.0