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

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

@@ -594,21 +594,22 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      * @return
      */
     @Transactional
-    public RestResponse<Integer> reviewVehicleBooking(Integer operatorId, Long bookRecordId,Integer rsStatus,String userName) throws Exception{
-        //获取相关申请记录
-        VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
-        //申请记录验证
-        if(vehicleBookRecord == null){
-            throw new BaseException(" invalid book record");
-        }
-        if(VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())){
-            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
-        }
-        //转换为相应预定参数
-        BookVehicleVO bookVehicleVo = new BookVehicleVO();
-        BeanUtils.copyProperties(bookVehicleVo,vehicleBookRecord);
-        bookVehicleVo.setBookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        bookVehicleVo.setBookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
+    public RestResponse<Integer> reviewVehicleBooking(Integer operatorId, Long bookRecordId,Integer rsStatus,String userName){
+        try {
+            //获取相关申请记录
+            VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
+            //申请记录验证
+            if(vehicleBookRecord == null){
+                throw new BaseException(" invalid book record");
+            }
+            if(!VehicleBookRecordStatus.APPLY.getCode().equals(vehicleBookRecord.getStatus())){
+                throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
+            }
+            //转换为相应预定参数
+            BookVehicleVO bookVehicleVo = new BookVehicleVO();
+            BeanUtils.copyProperties(bookVehicleVo,vehicleBookRecord);
+            bookVehicleVo.setBookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
+            bookVehicleVo.setBookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
 //        //审核通过的话，需要修改相关车辆预定记录
 //        if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
 //            Boolean hasSuc = bookedVehicle(bookVehicleVo);
@@ -625,24 +626,31 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 //            }
 //            vehicleBookHourInfoBiz.delete(vehicleBookRecord.getVehicleId(),list);
 //        }
-        //成功后修改预定记录状态
-        Map<String,Object> updateParam = Maps.newHashMap();
-        updateParam.put("id",bookRecordId);
-        updateParam.put("status",rsStatus);
-        updateParam.put("reviewerApply",operatorId);
-        updateParam.put("reviewerNameApply",userName);
-        updateParam.put("statusCondition",VehicleBookRecordStatus.APPLY.getCode());
-        Integer effected = vehicleBookRecordBiz.changeRecordStatus(updateParam);
-        if(effected == 0){//修改失败，手动回滚
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚
-            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
-        }else if(VehicleBookRecordStatus.REJECTED.getCode().equals(rsStatus)){
-            //拒绝，则释放bookinfo
-            bookVehicleVo.setUnbookStartDate(bookVehicleVo.getBookStartDate());
-            bookVehicleVo.setUnbookEndDate(bookVehicleVo.getBookEndDate());
-            Boolean hasSuc = unbookVehicle(bookVehicleVo);
+            //成功后修改预定记录状态
+            Map<String,Object> updateParam = Maps.newHashMap();
+            updateParam.put("id",bookRecordId);
+            updateParam.put("status",rsStatus);
+            updateParam.put("reviewerApply",operatorId);
+            updateParam.put("reviewerNameApply",userName);
+            updateParam.put("statusCondition",VehicleBookRecordStatus.APPLY.getCode());
+            Integer effected = vehicleBookRecordBiz.changeRecordStatus(updateParam);
+            if(effected == 0){//修改失败，手动回滚
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚
+                return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
+            }else if(VehicleBookRecordStatus.REJECTED.getCode().equals(rsStatus)){
+                //拒绝，则释放bookinfo
+                bookVehicleVo.setUnbookStartDate(bookVehicleVo.getBookStartDate());
+                bookVehicleVo.setUnbookEndDate(bookVehicleVo.getBookEndDate());
+                Boolean hasSuc = unbookVehicle(bookVehicleVo);
+                if(hasSuc) {
+                    return RestResponse.suc();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return RestResponse.codeAndMessage(1325, e.getMessage());
         }
-        return RestResponse.suc();
+        return RestResponse.codeAndMessage(1325, "取消预定失败");
     }
 
     /**
@@ -840,9 +848,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     private void uinbookDateList4DatePeriod(Map<String,List<String>> yearMonthAndDate,DateTime startDay,DateTime endDay){
         for( DateTime curDate = startDay;curDate.compareTo(endDay)<=0;curDate=curDate.plusDays(1)){
             String curDateStr = curDate.toString(DEFAULT_DATE_TIME_FORMATTER);
-            if(curDateStr.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER))<0){
-                throw new BaseException("只可以取消当前时间之后的车辆");
-            }
+//            if(curDateStr.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER))<0){
+//                throw new BaseException("只可以取消当前时间之后的车辆");
+//            }
             String curYearMonth = curDate.toString(YEARMONTH_DATE_TIME_FORMATTER);
             if(!yearMonthAndDate.containsKey(curYearMonth)){
                 yearMonthAndDate.put(curYearMonth,Lists.newArrayList());
@@ -861,7 +869,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      * @return
      */
     @Transactional
-    public Boolean unbookVehicle(BookVehicleVO bookVehicleVo){
+    public Boolean unbookVehicle(BookVehicleVO bookVehicleVo) throws Exception{
         //提取日期参数，改为每月一份
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();