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 | 74 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 40 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 9bb2ac0..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
@@ -26,12 +26,10 @@
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
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;
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.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -113,35 +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);
- }
-
- 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);
}
/**
@@ -532,7 +501,7 @@
for (int cid : cidList)
cids += cid + ",";
cids = cids.endsWith(",") ? cids.substring(0, cids.length() - 1) : cids;
-
+
params.put("cids", cids + "");
}
@@ -721,17 +690,42 @@
return hotWords;
}
- class DaTaoKeResult {
- Date updateTime;
- List<DaTaoKeDetail> dataList;
+ /**
+ * 楂樻晥杞摼
+ * @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()));
- public DaTaoKeResult(Date updateTime, List<DaTaoKeDetail> dataList) {
- this.updateTime = updateTime;
- this.dataList = dataList;
+ 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);
- public DaTaoKeResult() {
-
+ 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