From 671a0b04e156bdb00e2eda3082bef87934bceeb3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 15 四月 2019 15:22:23 +0800
Subject: [PATCH] 后端订单统计 队友关系bug优化

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
index 2276c83..654d68b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -17,8 +17,8 @@
 import org.springframework.stereotype.Component;
 import org.yeshi.utils.HttpUtil;
 
+import com.yeshi.fanli.dto.order.OrderItem;
 import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
@@ -736,6 +736,7 @@
 		commonOrder.setThirdCreateTime(
 				new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
 		commonOrder.setUpdateTime(new Date());
+		commonOrder.setTradeId(taoBaoOrder.getTradeId());
 
 		return commonOrder;
 

--
Gitblit v1.8.0