From b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 22 九月 2019 16:47:33 +0800
Subject: [PATCH] 金币BUG修改
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 aa0839f..6bb2c43 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
@@ -189,6 +189,7 @@
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);
// 鍟嗗搧淇℃伅
@@ -476,6 +477,7 @@
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;// 澶嶈喘姒�
/**
* 鍚勫ぇ姒滃崟
@@ -493,7 +495,13 @@
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<>());
+ // 鍋�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");
@@ -525,10 +533,49 @@
private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) {
DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
- detail.setCreateTime(new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+ 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;
List<DaTaoKeDetail> dataList;
@@ -542,5 +589,4 @@
}
}
-
}
--
Gitblit v1.8.0