修改出车时更改停靠公司

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

@@ -84,17 +84,20 @@ public class VehicleActiveService {
         if (MileageLift == null || MileageLift1 >= MileageLift) {
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
-            vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
             // 修改车辆状态，确认是空闲状态
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
+
             //修改预约记录状态
             VehicleBookRecord vehicleBookRecord = null;
             if (departureVo.getBookRecordId() != null) {
                 vehicleBookRecord = vehicleBookRecordBiz.selectById(departureVo.getBookRecordId());
                 updateBookRecordStatus(vehicleBookRecord, 1);
             }
+            if (vehicleBookRecord != null) {
+                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            }
+            vehicleMapper.updateByPrimaryKeySelective(vehicle);
             VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(departureVo.getBookRecordId());
             if (vehicleDepartureLogVo != null) {
                 BeanUtil.copyProperties(departureVo, vehicleDepartureLogVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
@@ -208,9 +211,6 @@ public class VehicleActiveService {
             }
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(MileageRest1);
-            if (vehicleBookRecord != null) {
-                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
-            }
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
             // 出车记录
             VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());