Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

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

@@ -202,7 +202,10 @@ public class VehicleActiveService {
         }
         if (MileageRest != null && MileageRest1 >= MileageRest) {
             VehicleBookRecord vehicleBookRecord = null;
-
+            if (arrivalVo.getBookRecordId() != null) {
+                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
+                updateBookRecordStatus(vehicleBookRecord, 2);
+            }
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(MileageRest1);
             if (vehicleBookRecord != null) {
@@ -260,10 +263,7 @@ public class VehicleActiveService {
             } else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间
                 vehicleBookRecord.setRemark(vehicleBookRecord.getRemark() + "  用户延期还车，实际占用日期");
             }
-            if (arrivalVo.getBookRecordId() != null) {
-                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
-                updateBookRecordStatus(vehicleBookRecord, 2);
-            }
+            updateBookRecordStatus(vehicleBookRecord, 2);
             departureLog.setMileageEnd(arrivalVo.getMileage());
             departureLog.setRecycleMan(arrivalVo.getRecycleMan());
             departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());