diff --git a/src/main/resources/mapper/CarMapper.xml b/src/main/resources/mapper/CarMapper.xml index caf324a..c873ae6 100644 --- a/src/main/resources/mapper/CarMapper.xml +++ b/src/main/resources/mapper/CarMapper.xml @@ -16,15 +16,16 @@ zcm.battery_type , ifnull(zom.overdue_days, 0) overdue_days, (case - when ifnull(zc.package_id, 0)>0 then 'NON_PACKAGE' - when zc.brs_status = '9' - and ifnull(zom.overdue_days, 0) > 0 - and zom.order_status = 'RENT_OVERDUE' then 'OVERDUE' - when zc.brs_status = '9' - and ifnull(zom.overdue_days, 0) = 0 - and zom.order_status = 'RENT_ING' then 'RENTING' - when zc.brs_status = '0' then 'FREE' - when zc.brs_status = '1' then 'REMOVED' + WHEN ifnull(zcmp.car_rule_num, 0)= 0 THEN 'NON_PACKAGE' + WHEN zc.brs_status = '9' + AND ifnull(zom.overdue_days, 0) > 0 + AND zom.order_status = 'RENT_OVERDUE' THEN 'OVERDUE' + WHEN zc.brs_status = '9' + AND ifnull(zom.overdue_days, 0) = 0 + AND zom.order_status = 'RENT_ING' THEN 'RENTING' + WHEN zc.brs_status = '9' THEN 'RENTING' + WHEN zc.brs_status = '0' THEN 'FREE' + WHEN zc.brs_status = '1' THEN 'REMOVED' END ) store_car_status, zc.brs_status, zcm.image, @@ -39,6 +40,13 @@ zcm.weight from zc_car zc + LEFT JOIN ( + SELECT + car_model_id, + count(car_rule_id) AS car_rule_num FROM zc_car_model_package + GROUP BY + car_model_id) zcmp ON + zc.model_id = zcmp.car_model_id left join ( select *