From 11c023db2513caa6db14fde07eafa2e8bc5ed9d1 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sun, 3 Aug 2025 22:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/sczx/order/convert/OrderConvert.java         | 3 ++-
 src/main/java/com/sczx/order/dto/OrderDetailDTO.java           | 3 +++
 .../java/com/sczx/order/service/impl/OrderServiceImpl.java     | 3 ++-
 .../java/com/sczx/order/thirdpart/dto/CarModelSimpleDTO.java   | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sczx/order/convert/OrderConvert.java b/src/main/java/com/sczx/order/convert/OrderConvert.java
index d4a4796..e5bb60f 100644
--- a/src/main/java/com/sczx/order/convert/OrderConvert.java
+++ b/src/main/java/com/sczx/order/convert/OrderConvert.java
@@ -64,6 +64,7 @@ public interface OrderConvert {
             @Mapping(source = "orderMainPO.actEndRentTime", target = "actEndRentTime"),
             @Mapping(source = "companyStoreDTO.name", target = "storeName"),
             @Mapping(source = "companyStoreDTO.detailedAddress", target = "detailedAddress"),
+            @Mapping(source = "carModelSimpleDTO.image", target = "image"),
             @Mapping(source = "carDTO.modelName", target = "modelName"),
             @Mapping(source = "carDTO.brandName", target = "brandName"),
             @Mapping(source = "carDTO.id", target = "carId"),
@@ -74,5 +75,5 @@ public interface OrderConvert {
             @Mapping(source = "rentBatteyRuleDTO.durationType", target = "durationType"),
             @Mapping(source = "rentBatteyOrder.vinBatteryNo", target = "batteyNo"),
     })
-    OrderDetailDTO mainOrderToDetailDTO(OrderMainPO orderMainPO, CompanyStoreDTO companyStoreDTO, RentBatteyRuleDTO rentBatteyRuleDTO, CarDTO carDTO, OrderSubPO rentBatteyOrder);
+    OrderDetailDTO mainOrderToDetailDTO(OrderMainPO orderMainPO, CompanyStoreDTO companyStoreDTO, RentBatteyRuleDTO rentBatteyRuleDTO, CarDTO carDTO, CarModelSimpleDTO carModelSimpleDTO,OrderSubPO rentBatteyOrder);
 }
diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
index 3be77c7..c705b75 100644
--- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
+++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
@@ -33,6 +33,9 @@ public class OrderDetailDTO {
     @ApiModelProperty("品牌名称")
     private String brandName;
 
+    @ApiModelProperty("车型图片")
+    private String image;
+
     @ApiModelProperty("车辆id")
     private String carId;
 
diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
index f4698e2..485baff 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -232,11 +232,12 @@ public class OrderServiceImpl implements OrderService {
         if(orderMainPO.getRentBatteyRuleId()!=null){
             rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
         }
+        CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId());
         CarDTO carDTO = null;
         if(orderMainPO.getVehicleId() !=null){
             carDTO = carInteg.getCarByCarCondition(CarQueryConditionReq.builder().carId(orderMainPO.getVehicleId()).build());
         }
-        OrderDetailDTO orderDetailDTO = OrderConvert.INSTANCE.mainOrderToDetailDTO(orderMainPO, companyStoreDTO, rentBatteyRuleDTO, carDTO, rentBatteyOrder);
+        OrderDetailDTO orderDetailDTO = OrderConvert.INSTANCE.mainOrderToDetailDTO(orderMainPO, companyStoreDTO, rentBatteyRuleDTO, carDTO, carModelSimpleDTO,rentBatteyOrder);
 
         SysDictDataDTO rentCarTypeDictDataDTO = storeInteg.getDictDataByDicTypeAndValue("key_order_rental_type", orderDetailDTO.getRentalType());
         orderDetailDTO.setRentalTypeLabel(Optional.ofNullable(rentCarTypeDictDataDTO).map(SysDictDataDTO::getDictLabel).orElse(null));
diff --git a/src/main/java/com/sczx/order/thirdpart/dto/CarModelSimpleDTO.java b/src/main/java/com/sczx/order/thirdpart/dto/CarModelSimpleDTO.java
index 9b742bd..51a1a43 100644
--- a/src/main/java/com/sczx/order/thirdpart/dto/CarModelSimpleDTO.java
+++ b/src/main/java/com/sczx/order/thirdpart/dto/CarModelSimpleDTO.java
@@ -34,4 +34,7 @@ public class CarModelSimpleDTO {
 
     @ApiModelProperty("电池类型")
     private String batteryType;
+
+    @ApiModelProperty("车型照片")
+    private String image;
 }