From eb3283722cde897dab6400d74f1e282946608fb9 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 28 Aug 2024 09:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9Evin=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/OrderService.java       | 3 +++
 .../main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java  | 1 +
 jsowell-ui/src/views/order/order/orderDetail.vue              | 4 ++++
 3 files changed, 8 insertions(+)

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 56a54097d..5f88ee3fb 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -430,6 +430,9 @@ public class OrderService {
         order.setTransactionCode(orderBasicInfo.getTransactionCode());
         order.setOrderStatus(orderBasicInfo.getOrderStatus());
         order.setLogicCard(orderBasicInfo.getLogicCard());
+        if (orderBasicInfo.getVinCode() != null) {
+            order.setVinCode(orderBasicInfo.getVinCode());
+        }
         String describe = orderBasicInfoService.transformOrderStatusDescribe(orderBasicInfo.getOrderStatus(), orderBasicInfo.getPayStatus());
         order.setOrderStatusDescribe(describe);
         order.setStartTime(DateUtils.formatDateTime(orderBasicInfo.getChargeStartTime()));
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
index a52a59a0b..a3af8d280 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
@@ -59,6 +59,7 @@ public class OrderDetailInfoVO {
 		private String orderStatus; // 订单状态
 		private String orderStatusDescribe; // 订单状态描述
 		private String logicCard; // 卡号
+		private String vinCode; // vin号
 		private String startTime; // 充电开始时间
 		private String endTime; // 充电结束时间
 		private String stopReasonMsg; // 停止原因
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 19d1b20b6..c21937b52 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -71,6 +71,10 @@
                         orderInfo.logicCard
                     }}
                 </el-descriptions-item>
+                <el-descriptions-item label="vin码">{{
+                        orderInfo.vinCode
+                    }}
+                </el-descriptions-item>
                 <el-descriptions-item label="订单状态描述">{{
                         orderInfo.orderStatusDescribe
                     }}