From fcbb1fae82f356bd5e7beea251e9e2eab1e39559 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 29 一月 2019 15:54:21 +0800
Subject: [PATCH] 邀请成功

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index fff7f87..558b6ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -1689,17 +1689,51 @@
 		return null;
 	}
 
+	/**
+	 * 鑾峰彇鎵�鏈夌殑璁㈠崟锛堜笉甯︽笭閬撲俊鎭笌浼氬憳淇℃伅锛�
+	 * 
+	 * @param startTime
+	 * @param appKey
+	 * @param appSecret
+	 * @return
+	 */
+	public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.order.get");
+		map.put("fields",
+				"tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk_status,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,relation_id,tb_trade_parent_id,tb_trade_id,num_iid,item_title,item_num,price,pay_price,seller_nick,seller_shop_title,commission,commission_rate,unid,create_time,earning_time,tk3rd_pub_id,tk3rd_site_id,tk3rd_adzone_id,special_id,click_time,relation_id,special_id");
+		map.put("start_time", startTime);
+		map.put("span", "1200");
+		map.put("tk_status", "1");
+		map.put("order_query_type", "create_time");
+		map.put("order_scene", "1");// 鎵�鏈夎鍗�
+		map.put("page_no", 1 + "");
+		map.put("page_size", 100 + "");
+
+		TaoKeAppInfo app = new TaoKeAppInfo();
+		app.setAppKey(appKey);
+		app.setAppSecret(appSecret);
+		try {
+			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
+			return parseTaoBaoOrder(json.toString());
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
 	private static List<TaoBaoOrder> parseTaoBaoOrder(String response) {
 
 		List<TaoBaoOrder> orderList = new ArrayList<>();
 
 		JSONObject data = JSONObject.fromObject(response);
 		if (data.optJSONObject("tbk_order_get_response") == null)
-			return null;
+			return orderList;
 		if (data.optJSONObject("tbk_order_get_response").optJSONObject("results") == null)
-			return null;
+			return orderList;
 		if (data.optJSONObject("tbk_order_get_response").optJSONObject("results").optJSONArray("n_tbk_order") == null)
-			return null;
+			return orderList;
 
 		JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")
 				.optJSONArray("n_tbk_order");
@@ -1707,14 +1741,14 @@
 			JSONObject item = array.optJSONObject(i);
 			TaoBaoOrder taoBaoOrder = new TaoBaoOrder();
 			taoBaoOrder.setAdPositionId(item.optString("adzone_id"));
-			taoBaoOrder.setAdPositionName("");
+			taoBaoOrder.setAdPositionName(item.optString("adzone_name"));
 			taoBaoOrder.setAuctionId(item.optLong("num_iid"));
 			taoBaoOrder.setClassName(item.optString("auction_category"));
 			taoBaoOrder.setClickTime(item.optString("click_time"));
 			taoBaoOrder.setCount(item.optInt("item_num"));
 			taoBaoOrder.setCreateTime(item.optString("create_time"));
-			if (!StringUtil.isNullOrEmpty(item.optString("commission")))
-				taoBaoOrder.seteIncome(new BigDecimal(item.optString("commission")));
+			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
+				taoBaoOrder.seteIncome(new BigDecimal(item.optString("total_commission_fee")));
 			else
 				taoBaoOrder.seteIncome(new BigDecimal(0));
 
@@ -1726,7 +1760,7 @@
 			taoBaoOrder.setLatestUpdateTime(null);
 			taoBaoOrder.setManagerWangWang(null);
 			taoBaoOrder.setOrderBy(null);
-			taoBaoOrder.setOrderId(item.optString("trade_id"));
+			taoBaoOrder.setOrderId(item.optString("trade_parent_id"));
 			if (item.optInt("tk_status") == 12)
 				taoBaoOrder.setOrderState("璁㈠崟浠樻");
 			else if (item.optInt("tk_status") == 3)
@@ -1737,8 +1771,8 @@
 				taoBaoOrder.setOrderState("璁㈠崟鎴愬姛");
 
 			taoBaoOrder.setOrderType(item.optString("order_type"));
-			if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))
-				taoBaoOrder.setPayment(new BigDecimal(item.optString("pay_price")));
+			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
+				taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));
 			else
 				taoBaoOrder.setPayment(new BigDecimal(0));
 			taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));

--
Gitblit v1.8.0