From f253c6f0ce5e708850f8e3c84a6a9008fc37df5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 19:15:13 +0800
Subject: [PATCH] 添加拼多多/京东的订单

---
 fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java |  118 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 67 insertions(+), 51 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 d814855..c15b551 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
@@ -5,6 +5,7 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -22,6 +23,7 @@
 import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -70,6 +72,7 @@
 
 	/**
 	 * 澶氬杩涘疂鍟嗗搧鏌ヨ
+	 * 
 	 * @param sf
 	 * @return
 	 */
@@ -94,50 +97,50 @@
 			map.put("keyword", sf.getKw());
 		if (sf.getGoodsIdList() != null)
 			map.put("goods_id_list", "[" + StringUtil.concat(sf.getGoodsIdList(), ",") + "]");
-		
-		
+
 		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();
-		
+
 		Gson gson = new GsonBuilder().disableHtmlEscaping().create();
 		List<PDDGoodsDetail> goodsList = gson.fromJson(array.toString(), type);
 		int totalCount = root.optInt("total_count");
 		return new PDDGoodsResult(totalCount, goodsList);
 	}
-	
-	
+
 	/**
-	 *  杩愯惀棰戦亾鍟嗗搧鏌ヨAPI
+	 * 杩愯惀棰戦亾鍟嗗搧鏌ヨAPI
+	 * 
 	 * @param page
 	 * @param pageSize
-	 * @param channelType  棰戦亾绫诲瀷锛�0, "1.9鍖呴偖", 1, "浠婃棩鐖嗘", 2, "鍝佺墝娓呬粨", 闈炲繀濉� ,榛樿鏄�1
+	 * @param channelType
+	 *            棰戦亾绫诲瀷锛�0, "1.9鍖呴偖", 1, "浠婃棩鐖嗘", 2, "鍝佺墝娓呬粨", 闈炲繀濉� ,榛樿鏄�1
 	 * @return
 	 */
 	public static PDDGoodsResult searchByChannelType(Integer page, Integer pageSize, String channelType) {
 		Map<String, String> map = new HashMap<>();
 		map.put("type", "pdd.ddk.goods.recommend.get");
-		map.put("offset", (page == null?0:page) + "");
-		map.put("offset", (pageSize == null?Constant.PAGE_SIZE:pageSize) + "");
-		
+		map.put("offset", (page == null ? 0 : page) + "");
+		map.put("offset", (pageSize == null ? Constant.PAGE_SIZE : pageSize) + "");
+
 		if (channelType != null)
 			map.put("channel_type", channelType);
-	
+
 		map.put("pid", PID_FANLI);
 		String result = baseRequest(map);
-		
+
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("goods_basic_detail_response");
 		if (root == null) {
@@ -147,35 +150,34 @@
 		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");
 		return new PDDGoodsResult(totalCount, goodsList);
 	}
-	
+
 	public static void getGoodsClass() {
 		Map<String, String> map = new HashMap<>();
 		map.put("type", "pdd.goods.cats.get");
 		map.put("parent_cat_id", "0");
 		String result = baseRequest(map);
-		
+
 		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  + "");
+		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");
@@ -186,43 +188,46 @@
 			System.out.println(array.optJSONObject(i).optString("goods_num"));
 			System.out.println("-------------------------------------------");
 		}
-		
+
 		System.out.println(root.optLong("total"));
 	}
-	
-	
+
 	public static void getGoodsOpt() {
 		Map<String, String> map = new HashMap<>();
 		map.put("type", "pdd.goods.opt.get");
 		map.put("parent_opt_id", "0");
 		String result = baseRequest(map);
-		
+
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("goods_opt_get_response");
 		JSONArray array = root.optJSONArray("goods_opt_list");
 	}
-	
-	
+
 	/**
 	 * 澶氬瀹㈣幏鍙栫垎娆炬帓琛屽晢鍝佹帴鍙�
-	 * @param pid  鎺ㄥ箍浣峣d    (闈炲繀濉�)
-	 * @param page 浠庡灏戜綅缃紑濮嬭姹傦紱榛樿鍊� 锛� 0     (闈炲繀濉�)
-	 * @param pageSize 璇锋眰鏁伴噺锛涢粯璁ゅ�� 锛�20    (闈炲繀濉�)
-	 * @param sortType 1-瀹炴椂鐑攢姒滐紱2-瀹炴椂鏀剁泭姒�    (闈炲繀濉�)
+	 * 
+	 * @param pid
+	 *            鎺ㄥ箍浣峣d (闈炲繀濉�)
+	 * @param page
+	 *            浠庡灏戜綅缃紑濮嬭姹傦紱榛樿鍊� 锛� 0 (闈炲繀濉�)
+	 * @param pageSize
+	 *            璇锋眰鏁伴噺锛涢粯璁ゅ�� 锛�20 (闈炲繀濉�)
+	 * @param sortType
+	 *            1-瀹炴椂鐑攢姒滐紱2-瀹炴椂鏀剁泭姒� (闈炲繀濉�)
 	 * @return
 	 */
 	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-1) * Constant.PAGE_SIZE) +"");
-		map.put("limit", (pageSize == null? Constant.PAGE_SIZE : pageSize) +"");
-		
+		map.put("offset", (page == null ? 0 : (page - 1) * Constant.PAGE_SIZE) + "");
+		map.put("limit", (pageSize == null ? Constant.PAGE_SIZE : pageSize) + "");
+
 		if (!StringUtil.isNullOrEmpty(pid))
 			map.put("p_id", pid + "");
-		
+
 		if (sortType != null)
 			map.put("sort_type", sortType + "");
-	
+
 		String result = baseRequest(map);
 		JSONObject json = JSONObject.fromObject(result);
 		JSONObject root = json.optJSONObject("top_goods_list_get_response");
@@ -233,16 +238,16 @@
 		if (array == null) {
 			return null;
 		}
-		
-		Type type = new TypeToken<List<PDDGoodsDetail>>() {}.getType();
-		
+
+		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);
 	}
-
 
 	/**
 	 * 鍟嗗搧杞摼
@@ -258,7 +263,7 @@
 		map.put("p_id", pid);
 		map.put("multi_group", "true");
 		map.put("generate_weapp_webview", "true");
-//		map.put("generate_weiboapp_webview", "true");
+		// map.put("generate_weiboapp_webview", "true");
 		JSONArray array = new JSONArray();
 		array.add(goodsId);
 		map.put("goods_id_list", array.toString());
@@ -302,7 +307,7 @@
 	 *            涓庡紑濮嬫椂闂翠笉寰楀ぇ浜�24灏忔椂
 	 * @return
 	 */
-	public static PDDOrderResult getOrders(int page, int pageSize, long startTime, long endTime) {
+	public static PDDOrderResult getOrdersList(int page, int pageSize, long startTime, long endTime) {
 		Map<String, String> map = new HashMap<>();
 		map.put("type", "pdd.ddk.order.list.increment.get");
 		map.put("start_update_time", startTime / 1000 + "");
@@ -340,12 +345,12 @@
 		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(resultArray.toString(), type);
@@ -353,8 +358,7 @@
 			return goodsList.get(0);
 		return null;
 	}
-	
-	
+
 	/**
 	 * 鑾峰彇鍟嗗搧璇︽儏
 	 * 
@@ -373,10 +377,22 @@
 		JSONObject root = resultJson.optJSONObject("ddk_phrase_generate_response");
 		if (root != null) {
 			array = root.optJSONArray("promotion_phrase_list");
-			JSONObject phraseObject = JSONObject.fromObject( array.get(0));
+			JSONObject phraseObject = JSONObject.fromObject(array.get(0));
 			return phraseObject.optString("phrase");
 		}
-		
+
+		return null;
+	}
+
+	public static Date getSystemTime() {
+		try {
+			Map<String, String> map = new HashMap<>();
+			map.put("type", "pdd.time.get");
+			String result = baseRequest(map);
+			String time = JSONObject.fromObject(result).optJSONObject("time_get_response").optString("time");
+			return new Date(TimeUtil.convertToTimeTemp(time, "yyyy-MM-dd HH:mm:ss"));
+		} catch (Exception e) {
+		}
 		return null;
 	}
 

--
Gitblit v1.8.0