From cebb70396a159270ce84cb44caeafa82faa439a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
index ba4be02..d814855 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java
@@ -98,10 +98,17 @@
 		
 		map.put("pid", PID_FANLI);
 		String result = baseRequest(map);
-		
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("goods_search_response");
+		if (root == null) {
+			return null;
+		} 
+		
 		JSONArray array = root.optJSONArray("goods_list");
+		if (array == null) {
+			return null;
+		}
+		
 		Type type = new TypeToken<List<PDDGoodsDetail>>() {
 		}.getType();
 		
@@ -133,7 +140,14 @@
 		
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("goods_basic_detail_response");
+		if (root == null) {
+			return null;
+		}
 		JSONArray array = root.optJSONArray("list");
+		if (array == null) {
+			return null;
+		}
+		
 		Type type = new TypeToken<List<PDDGoodsDetail>>() {
 		}.getType();
 		
@@ -152,6 +166,28 @@
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("goods_cats_get_response");
 		JSONArray array = root.optJSONArray("goods_cats_list");
+	}
+	
+	
+	public static void getThemes(Integer page, Integer pageSize) {
+		Map<String, String> map = new HashMap<>();
+		map.put("type", "pdd.ddk.theme.list.get");
+		map.put("page", page + "");
+		map.put("page_size", pageSize  + "");
+		String result = baseRequest(map);
+		
+		JSONObject json = JSONObject.fromObject(result);
+		JSONObject root = json.optJSONObject("theme_list_get_response");
+		JSONArray array = root.optJSONArray("theme_list");
+		for (int i = 0; i < array.size(); i++) {
+			System.out.println(array.optJSONObject(i).optString("id"));
+			System.out.println(array.optJSONObject(i).optString("name"));
+			System.out.println(array.optJSONObject(i).optString("image_url"));
+			System.out.println(array.optJSONObject(i).optString("goods_num"));
+			System.out.println("-------------------------------------------");
+		}
+		
+		System.out.println(root.optLong("total"));
 	}
 	
 	
@@ -178,7 +214,7 @@
 	public static PDDGoodsResult getTopList(String pid, Integer page, Integer pageSize, Integer sortType) {
 		Map<String, String> map = new HashMap<>();
 		map.put("type", "pdd.ddk.top.goods.list.query");
-		map.put("offset", (page == null? 0: page) +"");
+		map.put("offset", (page == null? 0: (page-1) * Constant.PAGE_SIZE) +"");
 		map.put("limit", (pageSize == null? Constant.PAGE_SIZE : pageSize) +"");
 		
 		if (!StringUtil.isNullOrEmpty(pid))
@@ -190,12 +226,20 @@
 		String result = baseRequest(map);
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("top_goods_list_get_response");
+		if (root == null) {
+			return null;
+		}
 		JSONArray array = root.optJSONArray("list");
+		if (array == null) {
+			return null;
+		}
+		
 		Type type = new TypeToken<List<PDDGoodsDetail>>() {}.getType();
 		
 		Gson gson = new GsonBuilder().disableHtmlEscaping().create();
 		List<PDDGoodsDetail> goodsList = gson.fromJson(array.toString(), type);
-		int totalCount = root.optInt("total");
+		//int totalCount = root.optInt("total");
+		int totalCount = 400; // 榛樿璁剧疆鎴�400
 		return new PDDGoodsResult(totalCount, goodsList);
 	}
 
@@ -225,9 +269,12 @@
 		String result = baseRequest(map);
 		JSONObject root = JSONObject.fromObject(result);
 		JSONObject json = root.optJSONObject("goods_promotion_url_generate_response");
-		array = json.optJSONArray("goods_promotion_url_list");
-		if (array != null && array.size() > 0)
-			return array.optJSONObject(0).optString("short_url");
+		if (json == null) {
+			return null;
+		}
+		JSONArray resultArray = json.optJSONArray("goods_promotion_url_list");
+		if (resultArray != null && resultArray.size() > 0)
+			return resultArray.optJSONObject(0).optString("short_url");
 		return null;
 	}
 
@@ -290,10 +337,18 @@
 		String result = baseRequest(map);
 		JSONObject resultJson = JSONObject.fromObject(result);
 		JSONObject root = resultJson.optJSONObject("goods_detail_response");
-		array = root.optJSONArray("goods_details");
+		if (root == null) {
+			return null;
+		}
+		
+		JSONArray resultArray = root.optJSONArray("goods_details");
+		if (resultArray == null) {
+			return null;
+		}
+		
 		Type type = new TypeToken<List<PDDGoodsDetail>>() {
 		}.getType();
-		List<PDDGoodsDetail> goodsList = new Gson().fromJson(array.toString(), type);
+		List<PDDGoodsDetail> goodsList = new Gson().fromJson(resultArray.toString(), type);
 		if (goodsList != null && goodsList.size() > 0)
 			return goodsList.get(0);
 		return null;

--
Gitblit v1.8.0