From 6a2e44aab53743d1595cdded27d85a8f67f3270c Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期二, 29 一月 2019 00:30:37 +0800
Subject: [PATCH] 爬单规则修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 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 2b6acca..fff7f87 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
@@ -1621,7 +1621,15 @@
 		return null;
 	}
 
-	public static void getTaoBaoSpecialOrder(String startTime, String appKey, String appSecret) {
+	/**
+	 * 鑾峰彇浼氬憳璁㈠崟
+	 * 
+	 * @param startTime
+	 * @param appKey
+	 * @param appSecret
+	 * @return
+	 */
+	public static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, String appKey, String appSecret) {
 		Map<String, String> map = new HashMap<>();
 		map.put("method", "taobao.tbk.order.get");
 		map.put("fields",
@@ -1639,22 +1647,31 @@
 		app.setAppSecret(appSecret);
 		try {
 			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
-			System.out.println(json.toString());
+			return parseTaoBaoOrder(json.toString());
 		} catch (TaoKeApiException e) {
 			e.printStackTrace();
 		}
+		return null;
 	}
 
+	/**
+	 * 鑾峰彇娓犻亾璁㈠崟
+	 * 
+	 * @param startTime
+	 * @param appKey
+	 * @param appSecret
+	 * @return
+	 */
 	public static List<TaoBaoOrder> getTaoBaoRelationOrder(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", "2019-01-28 18:39:00");
+		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", "3");
+		map.put("order_scene", "2");
 		map.put("page_no", 1 + "");
 		map.put("page_size", 100 + "");
 
@@ -1677,6 +1694,13 @@
 		List<TaoBaoOrder> orderList = new ArrayList<>();
 
 		JSONObject data = JSONObject.fromObject(response);
+		if (data.optJSONObject("tbk_order_get_response") == null)
+			return null;
+		if (data.optJSONObject("tbk_order_get_response").optJSONObject("results") == null)
+			return null;
+		if (data.optJSONObject("tbk_order_get_response").optJSONObject("results").optJSONArray("n_tbk_order") == null)
+			return null;
+
 		JSONArray array = data.optJSONObject("tbk_order_get_response").optJSONObject("results")
 				.optJSONArray("n_tbk_order");
 		for (int i = 0; i < array.size(); i++) {
@@ -1691,8 +1715,13 @@
 			taoBaoOrder.setCreateTime(item.optString("create_time"));
 			if (!StringUtil.isNullOrEmpty(item.optString("commission")))
 				taoBaoOrder.seteIncome(new BigDecimal(item.optString("commission")));
+			else
+				taoBaoOrder.seteIncome(new BigDecimal(0));
+
 			if (!StringUtil.isNullOrEmpty(item.optString("pub_share_pre_fee")))
 				taoBaoOrder.setEstimate(new BigDecimal(item.optString("pub_share_pre_fee")));
+			else
+				taoBaoOrder.setEstimate(new BigDecimal(0));
 			taoBaoOrder.setiRatio(new BigDecimal(item.optString("income_rate")).multiply(new BigDecimal(100)));
 			taoBaoOrder.setLatestUpdateTime(null);
 			taoBaoOrder.setManagerWangWang(null);
@@ -1710,9 +1739,13 @@
 			taoBaoOrder.setOrderType(item.optString("order_type"));
 			if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))
 				taoBaoOrder.setPayment(new BigDecimal(item.optString("pay_price")));
+			else
+				taoBaoOrder.setPayment(new BigDecimal(0));
 			taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));
 			if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))
 				taoBaoOrder.setSettlement(new BigDecimal(item.optString("alipay_total_price")));
+			else
+				taoBaoOrder.setSettlement(new BigDecimal(0));
 			taoBaoOrder.setSettlementTime(item.optString("earning_time"));
 			taoBaoOrder.setShop(item.optString("seller_shop_title"));
 			taoBaoOrder.setSourceMediaId(item.optString("site_id"));
@@ -1720,13 +1753,16 @@
 			taoBaoOrder.setsRatio(null);
 			taoBaoOrder.setSubsidy(null);
 			if (!StringUtil.isNullOrEmpty(item.optString("subsidy_rate")))
-				taoBaoOrder.setSubsidyRatio(new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
+				taoBaoOrder
+						.setSubsidyRatio(new BigDecimal(item.optString("subsidy_rate")).multiply(new BigDecimal(100)));
 			taoBaoOrder.setSubsidyType(item.optString("subsidy_type"));
 			taoBaoOrder.setTechnologySupportPercent(null);
 			taoBaoOrder.setThirdService(null);
 			taoBaoOrder.setTitle(item.optString("item_title"));
 			if (!StringUtil.isNullOrEmpty(item.optString("total_commission_fee")))
 				taoBaoOrder.setTkMoney(new BigDecimal(item.optString("total_commission_fee")));
+			else
+				taoBaoOrder.setTkMoney(new BigDecimal(0));
 			taoBaoOrder.setTkRate(new BigDecimal(item.optString("commission_rate")));
 			taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
 			taoBaoOrder.setRelationId(item.optString("relation_id"));

--
Gitblit v1.8.0