update commit

errand/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

errand/springboot/src/main/java/com/example/common/enums/OrderStatusEnum.java

@@ -0,0 +1,26 @@
+package com.example.common.enums;
+
+public enum OrderStatusEnum {
+
+    CANCEL("已取消"),
+    NO_ACCEPT("待接单"),
+    NO_ARRIVE("待送达"),
+    NO_RECEIVE("待收货"),
+    NO_COMMENT("待评价"),
+    DONE("已完成"),
+    ;
+
+    OrderStatusEnum(String value) {
+        this.value = value;
+    }
+
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

errand/springboot/src/main/java/com/example/entity/Orders.java

@@ -33,6 +33,27 @@ public class Orders {
     /** 订单备注 */
     private String comment;
 
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAcceptName() {
+        return acceptName;
+    }
+
+    public void setAcceptName(String acceptName) {
+        this.acceptName = acceptName;
+    }
+
+    //下单人名称
+    private String userName;
+    //接单人名称
+    private String acceptName;
+
     public Integer getId() {
         return id;
     }

errand/springboot/src/main/resources/mapper/OrdersMapper.xml

@@ -10,11 +10,15 @@
 
     <select id="selectAll" resultType="com.example.entity.Orders">
         select
-        <include refid="Base_Column_List" />
+        orders.*, user1.name as userName, user2.name as acceptName
         from orders
+        left join user user1
+        on orders.user_id = user1.id
+        left join user user2
+        on orders.accept_id = user2.id
         <where>
-            <if test="orderNo != null"> and order_no = #{orderNo}</if>
-            <if test="name != null"> and name like concat('%', #{name}, '%')</if>
+            <if test="orderNo != null"> and orders.order_no = #{orderNo}</if>
+            <if test="name != null"> and orders.name like concat('%', #{name}, '%')</if>
         </where>
         order by id desc
     </select>

errand/springboot/target/classes/mapper/OrdersMapper.xml

@@ -10,11 +10,15 @@
 
     <select id="selectAll" resultType="com.example.entity.Orders">
         select
-        <include refid="Base_Column_List" />
+        orders.*, user1.name as userName, user2.name as acceptName
         from orders
+        left join user user1
+        on orders.user_id = user1.id
+        left join user user2
+        on orders.accept_id = user2.id
         <where>
-            <if test="orderNo != null"> and order_no = #{orderNo}</if>
-            <if test="name != null"> and name like concat('%', #{name}, '%')</if>
+            <if test="orderNo != null"> and orders.order_no = #{orderNo}</if>
+            <if test="name != null"> and orders.name like concat('%', #{name}, '%')</if>
         </where>
         order by id desc
     </select>

errand/vue/src/router/index.js

@@ -31,7 +31,7 @@ const routes = [
     name: 'Front',
     component: () => import('../views/Front.vue'),
     children: [
-      { path: 'home', name: 'Home', meta: { name: '系统首页' }, component: () => import('../views/front/Home') },
+      { path: 'home', name: 'FHome', meta: { name: '系统首页' }, component: () => import('../views/front/Home') },
       { path: 'person', name: 'Person', meta: { name: '个人信息' }, component: () => import('../views/front/Person') },
     ]
   },