From d3e04511f34844917c67e894da23bef2718eb291 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 12:36:30 +0800
Subject: [PATCH] 用户消息修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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..06997f0 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
@@ -1695,11 +1695,11 @@
 
 		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");
@@ -1726,7 +1726,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 +1737,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