From 505d8e50a24a22cda05d04da8485ccc87fe8761e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 16:02:25 +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 |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 656127b..0a75e85 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
@@ -476,6 +476,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 +494,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");

--
Gitblit v1.8.0