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 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().eq(CarPO::getStoreId, storeId)); + return carRepo.count(new LambdaQueryWrapper().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 @@