From a4cc097c7a5bd6a0b8397fb232484df9e01ed4f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 七月 2019 17:05:50 +0800
Subject: [PATCH] 解决1.5.7产生的bug

---
 fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 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 4c81d5f..855054d 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
@@ -168,10 +168,10 @@
 					taoBaoShopDTO.setBrandId(item.optString("brand_id"));
 					taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
 					taoBaoShopDTO.setUserType(0);
-					
+
 					// 鍟嗗搧淇℃伅
 					taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO);
-					
+
 					break;
 				}
 			}
@@ -418,7 +418,6 @@
 		return StringUtil.Md5(signStr).toUpperCase();
 	}
 
-	
 	/**
 	 * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
 	 * 
@@ -429,20 +428,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"));
@@ -471,7 +470,6 @@
 		taoBaoShopDTO.setListGoods(listGoods);
 		return taoBaoShopDTO;
 	}
-	
 
 	public static int RANK_TYPE_TIME = 1;// 瀹炴椂
 	public static int RANK_TYPE_DAY = 2;// 鍏ㄥぉ姒�
@@ -483,16 +481,17 @@
 	 * @param type
 	 * @return
 	 */
-	public static DaTaoKeGoodsResult getRankingList(int type) {
+	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<>());
-		LogHelper.test("getRankingList:" + result);
 		JSONObject json = JSONObject.fromObject(result);
 		if (json != null) {
 			JSONArray array = json.optJSONArray("data");

--
Gitblit v1.8.0