From a81567b9f5ed95d989db186ef6e0f2f30e6da01d Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 16 Mar 2023 17:15:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     |  2 ++
 .../src/views/order/order/orderDetail.vue     | 21 ++-----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index aff90c576..586f231ec 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -589,6 +589,8 @@ public class OrderService {
 		OrderDetailInfoVO.OrderInfo order = new OrderDetailInfoVO.OrderInfo();
 		order.setOrderCode(orderBasicInfo.getOrderCode());
 		order.setOrderStatus(orderBasicInfo.getOrderStatus());
+		String describe = orderBasicInfoService.transformOrderStatusDescribe(orderBasicInfo.getOrderStatus(), orderBasicInfo.getPayStatus());
+		order.setOrderStatusDescribe(describe);
 		order.setStartTime(DateUtils.formatDateTime(orderBasicInfo.getChargeStartTime()));
 		order.setEndTime(DateUtils.formatDateTime(orderBasicInfo.getChargeEndTime()));
 		order.setCreateTime(DateUtils.formatDateTime(orderBasicInfo.getCreateTime()));
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 52305cb54..438edd0aa 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -29,7 +29,7 @@
           ></el-step>
           <el-step
             title="开始充电"
-            :description="status(orderInfo[0].orderStatus)"
+            :description="orderInfo[0].orderStatusDescribe"
           ></el-step>
           <el-step
             title="结束充电"
@@ -49,11 +49,7 @@
           align="center"
           width="280"
         ></el-table-column>
-        <el-table-column prop="orderStatus" label="订单状态" align="center">
-          <template slot-scope="scope">
-            <span>{{ status(scope.row.orderStatus) }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="orderStatusDescribe" label="订单状态描述" align="center"/>
         <el-table-column prop="createTime" label="创建时间" align="center"/>
         <el-table-column prop="startTime" label="开始时间" align="center"/>
         <el-table-column prop="endTime" label="结束时间" align="center"/>
@@ -212,19 +208,6 @@ export default {
       this.orderRealTimeInfo = [data.orderRealTimeInfo];
       this.orderDetail = [data.billingDetails];
     },
-    status(e) {
-      let arr = [
-        "未启动",
-        "充电中",
-        "待结算",
-        "待补缴",
-        "异常",
-        "可疑",
-        "订单完成",
-        "超时关闭",
-      ];
-      return e ? arr[e] : arr[0];
-    },
   },
 };
 </script>