diff --git a/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java b/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java index 67ea3ec..c31ea4a 100644 --- a/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java +++ b/src/main/java/com/sczx/car/dto/CarModelSimpleDTO.java @@ -32,9 +32,6 @@ public class CarModelSimpleDTO { @ApiModelProperty("是否支持免押(0不支持 1支持)") private String depositFree; - @ApiModelProperty("是否支持代扣(0不支持 1支持)") - private String autoDeduct; - @ApiModelProperty("电池类型") private String batteryType; diff --git a/src/main/resources/mapper/CarModelMapper.xml b/src/main/resources/mapper/CarModelMapper.xml index 80fc764..6cab875 100644 --- a/src/main/resources/mapper/CarModelMapper.xml +++ b/src/main/resources/mapper/CarModelMapper.xml @@ -14,8 +14,7 @@ cm.brand_name AS brand_name, cm.image AS image, GROUP_CONCAT(DISTINCT r.rental_type SEPARATOR ',') AS rental_types, - MAX(r.deposit_free) AS deposit_free, - MAX(r.auto_deduct) AS auto_deduct + MAX(r.deposit_free) AS deposit_free FROM zc_car_model cm JOIN @@ -28,20 +27,8 @@ zc_rent_car_rule r ON mp.car_rule_id = r.id AND r.del_flag = '0' AND r.status = '0' s.id = #{storeCarModelReq.storeId} - - AND ( - - - r.deposit_free = #{storeCarModelReq.depositFree} OR r.auto_deduct = #{storeCarModelReq.autoDeduct} - - - r.deposit_free = #{storeCarModelReq.depositFree} - - - r.auto_deduct = #{storeCarModelReq.autoDeduct} - - - ) + + and r.deposit_free = #{storeCarModelReq.depositFree} AND cm.del_flag = '0' AND cm.status = '0'