Commit d61a1269 authored by jiaorz's avatar jiaorz

会员类型添加

parent e6d6363f
...@@ -189,12 +189,12 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements ...@@ -189,12 +189,12 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
dto.setEndCompanyId(dto.getEndCompanyId()); dto.setEndCompanyId(dto.getEndCompanyId());
//查询可车辆信息 //查询可车辆信息
PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto); PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
if (pageDataVO.getData().size() <= 0 && dto.getMemberUse().equals(VehicleMemberType.NO.getCode())) { if (pageDataVO.getData().size() <= 0 && (dto.getMemberUse() == null || dto.getMemberUse().equals(VehicleMemberType.NO.getCode()))) {
throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{ throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{
add("可用车辆不存在"); add("可用车辆不存在");
}}); }});
} else if (pageDataVO.getData().size() <= 0 && !dto.getMemberUse().equals(VehicleMemberType.NO.getCode())) { } else if (pageDataVO.getData().size() <= 0 && (dto.getMemberUse() == null ||!dto.getMemberUse().equals(VehicleMemberType.NO.getCode()))) {
throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{ throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{
add("该车不能使用会员免费天数"); add("该车不能使用会员免费天数");
}}); }});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment