From c17f078f7b6b01e04d71356ac5ab54234840f18b Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 8 Oct 2020 11:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/custom/domain/SysOrder.java     |  1 +
 .../service/impl/SysOrderServiceImpl.java     | 23 ++++++++-----------
 .../mapper/custom/SysOrderMapper.xml          |  3 +++
 ruoyi-ui/src/views/custom/order/index.vue     | 13 +++++++++++
 4 files changed, 26 insertions(+), 14 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 b3d14d208..ba8f0b93a 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
@@ -19,6 +19,7 @@ public class SysOrder extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
+    @Excel(name = "编号")
     private Long orderId;
 
     /** 客户姓名 */
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 f49d8c84d..e917cdf7d 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,6 +1,7 @@
 package com.ruoyi.custom.service.impl;
 
 import java.util.List;
+
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,8 +16,7 @@ import com.ruoyi.custom.service.ISysOrderService;
  * @date 2020-09-24
  */
 @Service
-public class SysOrderServiceImpl implements ISysOrderService
-{
+public class SysOrderServiceImpl implements ISysOrderService {
     @Autowired
     private SysOrderMapper sysOrderMapper;
 
@@ -27,8 +27,7 @@ public class SysOrderServiceImpl implements ISysOrderService
      * @return 销售订单
      */
     @Override
-    public SysOrder selectSysOrderById(Long orderId)
-    {
+    public SysOrder selectSysOrderById(Long orderId) {
         return sysOrderMapper.selectSysOrderById(orderId);
     }
 
@@ -39,8 +38,7 @@ public class SysOrderServiceImpl implements ISysOrderService
      * @return 销售订单
      */
     @Override
-    public List<SysOrder> selectSysOrderList(SysOrder sysOrder)
-    {
+    public List<SysOrder> selectSysOrderList(SysOrder sysOrder) {
         return sysOrderMapper.selectSysOrderList(sysOrder);
     }
 
@@ -51,10 +49,10 @@ public class SysOrderServiceImpl implements ISysOrderService
      * @return 结果
      */
     @Override
-    public int insertSysOrder(SysOrder sysOrder)
-    {
+    public int insertSysOrder(SysOrder sysOrder) {
         sysOrder.setCreateTime(DateUtils.getNowDate());
         sysOrder.setOrderTime(DateUtils.getNowDate());
+        sysOrder.setOrderId(new Long(DateUtils.dateTimeNow()));
         return sysOrderMapper.insertSysOrder(sysOrder);
     }
 
@@ -65,8 +63,7 @@ public class SysOrderServiceImpl implements ISysOrderService
      * @return 结果
      */
     @Override
-    public int updateSysOrder(SysOrder sysOrder)
-    {
+    public int updateSysOrder(SysOrder sysOrder) {
         sysOrder.setUpdateTime(DateUtils.getNowDate());
         return sysOrderMapper.updateSysOrder(sysOrder);
     }
@@ -78,8 +75,7 @@ public class SysOrderServiceImpl implements ISysOrderService
      * @return 结果
      */
     @Override
-    public int deleteSysOrderByIds(Long[] orderIds)
-    {
+    public int deleteSysOrderByIds(Long[] orderIds) {
         return sysOrderMapper.deleteSysOrderByIds(orderIds);
     }
 
@@ -90,8 +86,7 @@ public class SysOrderServiceImpl implements ISysOrderService
      * @return 结果
      */
     @Override
-    public int deleteSysOrderById(Long orderId)
-    {
+    public int deleteSysOrderById(Long orderId) {
         return sysOrderMapper.deleteSysOrderById(orderId);
     }
 }
\ No newline at end of file
diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
index 4d80bed48..62a50b777 100644
--- a/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
+++ b/ruoyi-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
@@ -40,6 +40,7 @@
     <select id="selectSysOrderList" parameterType="SysOrder" resultMap="SysOrderResult">
         <include refid="selectSysOrderVo"/>
         <where>
+            <if test="orderId != null  and orderId != ''">and order_id = #{orderId}</if>
             <if test="customer != null  and customer != ''">and customer = #{customer}</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="payTypeId != null ">and pay_type_id = #{payTypeId}</if>
@@ -68,6 +69,7 @@
     <insert id="insertSysOrder" parameterType="SysOrder" useGeneratedKeys="true" keyProperty="orderId">
         insert into sys_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">order_id,</if>
             <if test="customer != null and customer != ''">customer,</if>
             <if test="phone != null">phone,</if>
             <if test="amount != null">amount,</if>
@@ -91,6 +93,7 @@
             <if test="reviewStatus != null">review_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null and orderId != ''">#{orderId},</if>
             <if test="customer != null and customer != ''">#{customer},</if>
             <if test="phone != null">#{phone},</if>
             <if test="amount != null">#{amount},</if>
diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue
index f98362995..bc57bf5bf 100644
--- a/ruoyi-ui/src/views/custom/order/index.vue
+++ b/ruoyi-ui/src/views/custom/order/index.vue
@@ -2,6 +2,17 @@
   <div class="app-container">
     <el-row>
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
+        <el-col :span="6">
+          <el-form-item label="订单编号" prop="orderId">
+            <el-input
+              v-model="queryParams.orderId"
+              placeholder="请输入订单编号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="客户姓名" prop="customer">
             <el-input
@@ -175,6 +186,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+      <el-table-column label="编号" align="center" prop="orderId" width="150" fixed="left"/>
       <el-table-column label="审核状态" align="center" prop="reviewStatus" width="80" fixed="left">
         <template slot-scope="scope">
           <el-tag
@@ -466,6 +478,7 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
+          orderId: null,
           customer: null,
           phone: null,
           payTypeId: null,