From 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 1 +
1 files changed, 1 insertions(+), 0 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 16d7b30..ff6aa07 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
@@ -1906,6 +1906,7 @@
taoBaoOrder.setTransactionPlatform(item.optString("terminal_type"));
taoBaoOrder.setRelationId(item.optString("relation_id"));
taoBaoOrder.setSpecialId(item.optString("special_id"));
+ taoBaoOrder.setTradeId(item.optString("trade_id"));
orderList.add(taoBaoOrder);
} catch (Exception e) {
try {
--
Gitblit v1.8.0