From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 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..12a6081 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
@@ -119,6 +119,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
*
@@ -167,10 +175,10 @@
taoBaoShopDTO.setBrandId(item.optString("brand_id"));
taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
taoBaoShopDTO.setUserType(0);
-
+
// 鍟嗗搧淇℃伅
taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO);
-
+
break;
}
}
@@ -417,7 +425,6 @@
return StringUtil.Md5(signStr).toUpperCase();
}
-
/**
* 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
*
@@ -428,20 +435,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 +477,47 @@
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;// 鐑帹姒�
+
+ /**
+ * 鍚勫ぇ姒滃崟
+ *
+ * @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.0.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<>());
+ 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 = 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"));
+ list.add(item);
+ }
+ daTaoKeGoodsResult.setGoodsList(list);
+ }
+ return daTaoKeGoodsResult;
+
+ }
class DaTaoKeResult {
Date updateTime;
--
Gitblit v1.8.0