From a4eaf1a8692e029bbd496bb1e00afadd20114aa6 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Thu, 31 Jul 2025 18:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E7=89=8C=E5=8F=B7=E5=92=8C=E8=BD=A6=E6=9E=B6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sczx/order/dto/OrderSimpleDTO.java | 9 +++++++++
 src/main/resources/mapper/OrderMainMapper.xml        | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java b/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java
index 5b90c8a..412c921 100644
--- a/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java
+++ b/src/main/java/com/sczx/order/dto/OrderSimpleDTO.java
@@ -39,6 +39,15 @@ public class OrderSimpleDTO {
     @ApiModelProperty("品牌名称")
     private String brandName;
 
+    @ApiModelProperty("车辆id")
+    private Long vehicleId;
+
+    @ApiModelProperty("车架号(VIN)")
+    private String vin;
+
+    @ApiModelProperty("车牌号码")
+    private String licensePlate;
+
     @ApiModelProperty("车型图片")
     private String image;
 
diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml
index c40c545..afd290d 100644
--- a/src/main/resources/mapper/OrderMainMapper.xml
+++ b/src/main/resources/mapper/OrderMainMapper.xml
@@ -25,10 +25,17 @@
             o.first_order_time,
             o.end_rent_time,
             o.car_model_id,
+            o.vehicle_id,
+            c.license_plate,
+            c.vin,
             m.model_name,
             m.brand_name,
             m.image
-        from zc_order_main o join zc_car_model m on o.car_model_id = m.id
+        from
+            zc_order_main o
+        join zc_car_model m on o.car_model_id = m.id
+        LEFT JOIN zc_car c on o.vehicle_id = c.id
+
         <where>
             <if test="customerId != null">
                 and o.customer_id = #{customerId}