From c1013dea174e474c68658a979d1f1da312d5bbf7 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Wed, 13 Aug 2025 23:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BD=A6=E8=BE=86=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=8B=86=E5=88=86=E6=88=903=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sczx/order/common/enums/OrderCarImgTypeEnum.java   |  1 -
 src/main/java/com/sczx/order/dto/OrderDetailDTO.java   | 10 ++++++++--
 .../com/sczx/order/service/impl/OrderServiceImpl.java  |  9 +++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/sczx/order/common/enums/OrderCarImgTypeEnum.java b/src/main/java/com/sczx/order/common/enums/OrderCarImgTypeEnum.java
index 893c5e9..8c48a5a 100644
--- a/src/main/java/com/sczx/order/common/enums/OrderCarImgTypeEnum.java
+++ b/src/main/java/com/sczx/order/common/enums/OrderCarImgTypeEnum.java
@@ -13,7 +13,6 @@ import lombok.Getter;
 public enum OrderCarImgTypeEnum {
     RENT("RENT", "租车"),
     RETURN("RETURN", "还车"),
-    CONFIRM_RETURN("CONFIRM_RETURN", "确认还车"),
     CAR_DAMAGE("CAR_DAMAGE", "车损"),
     ;
     private final String code;
diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
index 873d535..3077a11 100644
--- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
+++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java
@@ -156,6 +156,12 @@ public class OrderDetailDTO {
     @ApiModelProperty("预计到期间隔天数")
     private Integer expectedDays;
 
-    @ApiModelProperty("订单车辆图片")
-    private List<OrderCarImgDTO> orderCarImgList;
+    @ApiModelProperty("订单车辆图片-租车")
+    private List<OrderCarImgDTO> orderCarImgRentList;
+
+    @ApiModelProperty("订单车辆图片-还车")
+    private List<OrderCarImgDTO> orderCarImgReturnList;
+
+    @ApiModelProperty("订单车辆图片-车损")
+    private List<OrderCarImgDTO> orderCarImgDamageList;
 }
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 250b757..36a503d 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -435,8 +435,13 @@ public class OrderServiceImpl implements OrderService {
         //查询订单车辆图片
         List<OrderCarImgPO> orderCarImgPOList = orderCarImgRepo.list(new LambdaQueryWrapper<OrderCarImgPO>().eq(OrderCarImgPO::getOrderId, orderDetailDTO.getOrderId()));
         if(!CollectionUtils.isEmpty(orderCarImgPOList)){
-
-            orderDetailDTO.setOrderCarImgList(OrderCarImgConvert.INSTANCE.posToDtos(orderCarImgPOList));
+            List<OrderCarImgDTO> orderCarImgList = OrderCarImgConvert.INSTANCE.posToDtos(orderCarImgPOList);
+            List<OrderCarImgDTO> orderCarImgRentList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.RENT.getCode())).collect(Collectors.toList());
+            orderDetailDTO.setOrderCarImgRentList(orderCarImgRentList);
+            List<OrderCarImgDTO> orderCarImgReturnList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.RETURN.getCode())).collect(Collectors.toList());
+            orderDetailDTO.setOrderCarImgReturnList(orderCarImgReturnList);
+            List<OrderCarImgDTO> orderCarImgDamageList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.CAR_DAMAGE.getCode())).collect(Collectors.toList());
+            orderDetailDTO.setOrderCarImgDamageList(orderCarImgDamageList);
         }
         else if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){
             //如果是租车中，需要判断是否逾期了