修改租車訂單地址，修改车辆预定时添加订单号

ace-common/src/main/resources/properties/resultcod.properties

@@ -214,7 +214,7 @@ BOOKED_FAILED_CODE = 4007
 4007=车辆预定失败，请重试！
 
 ONLY_BOOK_FROM_TODAY = 4008
-4008=预定时间不能小于当前时间
+4008=取消或预定时间不能小于当前时间
 
 ADD_VEHICLE_FAIL = 4009
 4009 = 添加车辆失败，请重试

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -609,8 +609,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(vehicleBookRecord == null){
             return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
         }
-        if(!VehicleBookRecordStatus.APPLY.getCode().equals(vehicleBookRecord.getStatus())){
-            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
+        if(VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())){
+            return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getDesc());
         }
         //转换为相应预定参数
         BookVehicleVO bookVehicleVo = new BookVehicleVO();