From 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 28 二月 2020 15:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 82 ++++++++++++-----------------------------
1 files changed, 24 insertions(+), 58 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 693a84c..bc57941 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;
@@ -115,34 +113,7 @@
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);
- }
+
/**
* 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
@@ -360,7 +331,7 @@
}
return null;
}
-
+
public static DaTaoKeDetailV2 getGoodsDetailByGoodsId(Long goodsId) {
TaoKeAppInfo app = getRandomApp();
Map<String, String> params = new TreeMap<>();
@@ -417,11 +388,11 @@
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()));
@@ -440,8 +411,7 @@
}
return daTaoKeGoodsResult;
}
-
-
+
public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int page, int pageSize, Integer sort) {
@@ -456,10 +426,10 @@
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) {
@@ -470,11 +440,11 @@
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()));
@@ -496,6 +466,7 @@
/**
* 鍟嗗搧鍒楄〃
+ *
* @param key
* @param cidList
* @param priceLowerLimit
@@ -515,18 +486,27 @@
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 +"");
-
+ 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);
@@ -710,19 +690,5 @@
}
}
return hotWords;
- }
-
- class DaTaoKeResult {
- Date updateTime;
- List<DaTaoKeDetail> dataList;
-
- public DaTaoKeResult(Date updateTime, List<DaTaoKeDetail> dataList) {
- this.updateTime = updateTime;
- this.dataList = dataList;
- }
-
- public DaTaoKeResult() {
-
- }
}
}
--
Gitblit v1.8.0