From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 2c48c1e..4aced39 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -226,14 +226,11 @@
 		SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
 
 		for (CommonOrderVO order : listOrder) {
-			Date createTime = order.getCreateTime();
-			if (createTime != null) {
-				order.setObtainTime(createTime.getTime());
-			}
 
 			Date thirdCreateTime = order.getThirdCreateTime();
 			if (thirdCreateTime != null) {
 				order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
+				order.setObtainTime(thirdCreateTime.getTime());
 			}
 
 			Date settleTime = order.getSettleTime();

--
Gitblit v1.8.0