From 7d854f187ac549afec8f1825ab1974e6b975ae5d Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Wed, 27 Aug 2025 20:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=97=A8=E5=BA=97=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sczx/car/dto/StoreCarDTO.java    |  3 ++
 .../com/sczx/car/dto/req/StoreCarReq.java     |  5 +++
 .../sczx/car/service/impl/CarServiceImpl.java |  2 +-
 src/main/resources/mapper/CarMapper.xml       | 32 +++++++++++++++----
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/sczx/car/dto/StoreCarDTO.java b/src/main/java/com/sczx/car/dto/StoreCarDTO.java
index c7d5097..e27fb5a 100644
--- a/src/main/java/com/sczx/car/dto/StoreCarDTO.java
+++ b/src/main/java/com/sczx/car/dto/StoreCarDTO.java
@@ -28,6 +28,9 @@ public class StoreCarDTO {
     @ApiModelProperty("车辆型号名称")
     private String modelName;
 
+    @ApiModelProperty("车辆图片，多图片逗号分隔")
+    private String images;
+
     @ApiModelProperty("支持电池类型(48V标准版/100km,48V超长版/200km等)")
     private String batteryType;
 
diff --git a/src/main/java/com/sczx/car/dto/req/StoreCarReq.java b/src/main/java/com/sczx/car/dto/req/StoreCarReq.java
index 1c63970..39a5783 100644
--- a/src/main/java/com/sczx/car/dto/req/StoreCarReq.java
+++ b/src/main/java/com/sczx/car/dto/req/StoreCarReq.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel(value = "门店车辆查询请求")
 public class StoreCarReq {
@@ -14,4 +16,7 @@ public class StoreCarReq {
     @ApiModelProperty("车牌号码")
     private String licensePlate;
 
+    @ApiModelProperty("门店车辆状态")
+    private List<String> storeCarStatusList;
+
 }
diff --git a/src/main/java/com/sczx/car/service/impl/CarServiceImpl.java b/src/main/java/com/sczx/car/service/impl/CarServiceImpl.java
index b445aad..4151c64 100644
--- a/src/main/java/com/sczx/car/service/impl/CarServiceImpl.java
+++ b/src/main/java/com/sczx/car/service/impl/CarServiceImpl.java
@@ -54,7 +54,7 @@ public class CarServiceImpl implements CarService {
 
     @Override
     public Long countCarByStoreId(Long storeId) {
-        return carRepo.count(new LambdaQueryWrapper<CarPO>().eq(CarPO::getStoreId, storeId));
+        return carRepo.count(new LambdaQueryWrapper<CarPO>().eq(CarPO::getStoreId, storeId).eq(CarPO::getDelFlag, "0").eq(CarPO::getStatus, "0"));
     }
 
     @Override
diff --git a/src/main/resources/mapper/CarMapper.xml b/src/main/resources/mapper/CarMapper.xml
index 577df61..6fd54eb 100644
--- a/src/main/resources/mapper/CarMapper.xml
+++ b/src/main/resources/mapper/CarMapper.xml
@@ -3,6 +3,10 @@
 <mapper namespace="com.sczx.car.mapper.CarMapper">
 
     <select id="pageStoreCar" resultType="com.sczx.car.dto.StoreCarDTO">
+        select
+        *
+        from
+        (
         select
         zc.id,
         zc.vin,
@@ -21,7 +25,13 @@
         and zom.order_status = 'RENT_ING' then 'RENTING'
         when zc.brs_status = '0' then 'FREE'
         when zc.brs_status = '1' then 'REMOVED'
-        END ) store_car_status
+        END ) store_car_status,
+        zc.brs_status,
+        zc.images,
+        zom.order_status,
+        zom.order_no,
+        zc.update_time,
+        zc.store_id
         from
         zc_car zc
         left join (
@@ -40,14 +50,22 @@
         where
         del_flag = 0
         and status = 0
-        and store_id = #{storeCarReq.storeId}
-        <if test="storeCarReq.licensePlate != null and storeCarReq.licensePlate != ''">
-            and license_plate like concat('%', #{storeCarReq.licensePlate}, '%')
-        </if>
-        ) )zom
+        and store_id = #{storeCarReq.storeId}) )zom
         on
         zc.id = zom.vehicle_id
+        ) a
+        where
+        a.store_id = #{storeCarReq.storeId}
+        <if test="storeCarReq.storeCarStatusList != null and storeCarReq.storeCarStatusList.size() > 0">
+            and a.store_car_status
+            in <foreach collection="storeCarReq.storeCarStatusList" item="carStatus" open="(" separator="," close=")">
+                #{carStatus}
+            </foreach>
+        </if>
+        <if test="storeCarReq.licensePlate != null and storeCarReq.licensePlate != ''">
+            and a.license_plate like concat('%', #{storeCarReq.licensePlate}, '%')
+        </if>
         order by
-        zc.update_time desc
+        a.update_time desc
     </select>
 </mapper>