出车，还车时更新公里数到车辆信息

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleActiveService.java

@@ -48,15 +48,6 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
 
-        // 修改车辆状态，确认是空闲状态
-        int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
-                VehicleStatus.NORMAL.getCode());
-
-        if (result == 0) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
-        }
-
         // 出车记录
         VehicleDepartureLog departureLog = new VehicleDepartureLog();
         BeanUtils.copyProperties(departureVo, departureLog);
@@ -72,6 +63,20 @@ public class VehicleActiveService {
         activeLog.setStartTime(new Date());
         activeLog.setCreateTime(new Date());
         vehicleActiveLogMapper.insert(activeLog);
+
+        // 写入车辆公里数
+        vehicle.setMileageLastUpdate(departureVo.getMileage());
+        vehicleMapper.updateByPrimaryKeySelective(vehicle);
+
+
+        // 修改车辆状态，确认是空闲状态
+        int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
+                VehicleStatus.NORMAL.getCode());
+
+        if (result == 0) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
+        }
     }
 
     @Transactional
@@ -86,14 +91,6 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
         }
 
-        // 修改状态，确认是出车状态
-        int result = vehicleMapper.updateStatusByIdAndStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode(),
-                VehicleStatus.DEPARTURE.getCode());
-        if (result == 0) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-        }
-
         // 出车记录
         VehicleDepartureLog departureLog = vehicleDepartureLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
         if (departureLog == null) {
@@ -116,5 +113,17 @@ public class VehicleActiveService {
         activeLog.setEndTime(new Date());
         activeLog.setUpdateTime(new Date());
         vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
+
+        // 写入车辆公里数
+        vehicle.setMileageLastUpdate(arrivalVo.getMileage());
+        vehicleMapper.updateByPrimaryKeySelective(vehicle);
+
+        // 修改状态，确认是出车状态
+        int result = vehicleMapper.updateStatusByIdAndStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode(),
+                VehicleStatus.DEPARTURE.getCode());
+        if (result == 0) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+        }
     }
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/entity/VehicleDepartureLog.java

@@ -60,11 +60,11 @@ public class VehicleDepartureLog {
     /**
      * 出车开始的公里数
      */
-    String mileageStart;
+    Integer mileageStart;
     /**
      * 出车结束的公里数
      */
-    String mileageEnd;
+    Integer mileageEnd;
 
     Date createTime;
     Date updateTime;

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleArrivalVo.java

@@ -21,6 +21,6 @@ public class VehicleArrivalVo {
     /**
      * 公里数
      */
-    String mileage;
+    Integer mileage;
 
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleDepartureVo.java

@@ -35,6 +35,6 @@ public class VehicleDepartureVo {
     /**
      * 公里数
      */
-    String mileage;
+    Integer mileage;
 
 }