From a74f2238be8deffed1c4dc3e905fb53131bacd94 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Wed, 14 Oct 2020 22:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E4=BA=A4=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/custom/domain/SysOrder.java   | 2 +-
 .../ruoyi/custom/service/impl/SysOrderServiceImpl.java    | 8 +++++---
 ruoyi-ui/src/views/custom/order/index.vue                 | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
index 33d1eace5..da5d75b4d 100644
--- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
+++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysOrder.java
@@ -170,7 +170,7 @@ public class SysOrder extends BaseEntity {
      * 成交日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "成交日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 
     public String getServeTime() {
diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java
index e917cdf7d..c9c144e54 100644
--- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java
+++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.custom.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
@@ -50,9 +51,10 @@ public class SysOrderServiceImpl implements ISysOrderService {
      */
     @Override
     public int insertSysOrder(SysOrder sysOrder) {
-        sysOrder.setCreateTime(DateUtils.getNowDate());
-        sysOrder.setOrderTime(DateUtils.getNowDate());
-        sysOrder.setOrderId(new Long(DateUtils.dateTimeNow()));
+        Date orderTime = DateUtils.getNowDate();
+        sysOrder.setCreateTime(orderTime);
+        sysOrder.setOrderTime(orderTime);
+        sysOrder.setOrderId(Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, orderTime)));
         return sysOrderMapper.insertSysOrder(sysOrder);
     }
 
diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue
index 3d6167de3..a2cd21698 100644
--- a/ruoyi-ui/src/views/custom/order/index.vue
+++ b/ruoyi-ui/src/views/custom/order/index.vue
@@ -207,9 +207,9 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="成交日期" align="center" prop="orderTime" width="120" fixed="left">
+      <el-table-column label="成交时间" align="center" prop="orderTime" width="160" fixed="left">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="客户姓名" align="center" prop="customer" width="120" fixed="left"/>