修改合并

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -19,6 +19,7 @@ public enum ResCode {
     //车辆信息相关返回码-预定申请信息
     VEHICLE_BOOKED_RECORD_ALREADY_CHANGED(103001,"车辆预定申请已被审批，请刷新后继续操作"),
     VEHICLE_BOOKED_RECORD_STATUS_CHANGED(103002,"车辆预定申请状态已变更，请刷新后继续操作"),
+    VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED(103003,"车辆预定里程数不符合，请刷新后继续操作"),
 
     VEHICLE_DEPARTURE_VEHICLE_UNEXIST(104001,"车辆不存在"),
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),

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

@@ -16,6 +16,7 @@ import com.xxfc.platform.vehicle.pojo.VehicleUpkeepEndVo;
 import com.xxfc.platform.vehicle.pojo.VehicleUpkeepVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -40,6 +41,8 @@ public class VehicleActiveService {
 
     @Autowired
     VehicleUpkeepItemMapper vehicleUpkeepItemMapper;
+    @Value("${vehicle.mileage}")
+    private Integer Mileage;
 
     /**
      * 出车
@@ -57,9 +60,15 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
-
+        Integer MileageLift=vehicle.getMileageLastUpdate();
+        Integer MileageLift1=departureVo.getMileage();
+        if(MileageLift1==null){
+            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
+                    ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
+        }
+        if(MileageLift==null||MileageLift1>=MileageLift){
             // 写入车辆公里数,预计目的地
-        vehicle.setMileageLastUpdate(departureVo.getMileage());
+            vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
@@ -88,6 +97,13 @@ public class VehicleActiveService {
             activeLog.setStartTime(new Date());
             activeLog.setCreateTime(new Date());
             vehicleActiveLogMapper.insert(activeLog);
+        }else {
+            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
+                    ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
+        }
+
+
+
 
     }
 
@@ -102,9 +118,16 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
         }
+        Integer Mileagerest = vehicle.getMileageLastUpdate();
+        Integer Mileagerest1 = arrivalVo.getMileage();
+        if (Mileagerest1 == null) {
+            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
+                    ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
+        }
+        if (Mileagerest != null && Mileagerest1 >= Mileagerest) {
 
             // 写入车辆公里数,还车分公司id
-        vehicle.setMileageLastUpdate(arrivalVo.getMileage());
+            vehicle.setMileageLastUpdate(Mileagerest1);
             vehicle.setParkBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
@@ -142,6 +165,10 @@ public class VehicleActiveService {
             activeLog.setUpdateTime(new Date());
             vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
 
+        } else {
+            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
+                    ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
+        }
     }
 
     /**
@@ -161,9 +188,9 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getCode());
         }
-
-        int result = vehicleMapper.updateStatusByIdAndStatus(vehicleUpkeepVo.getVehicleId(), VehicleStatus.UPKEEP.getCode(),
-                VehicleStatus.NORMAL.getCode());
+        Integer lastMileage=vehicleUpkeepVo.getMileage();
+        int result = vehicleMapper.upMileageByIdAndStatus(vehicleUpkeepVo.getVehicleId(), VehicleStatus.UPKEEP.getCode(),
+                VehicleStatus.NORMAL.getCode(),lastMileage);
         if (result == 0) {
             // 车辆状态异常
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -214,8 +241,9 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getCode());
         }
-
-        int result = vehicleMapper.updateStatusByIdAndStatus(vehicleId, VehicleStatus.NORMAL.getCode(), VehicleStatus.UPKEEP.getCode());
+        Integer mileageLastUpdate=vehicle.getMileageLastUpdate()==null?0:vehicle.getMileageLastUpdate();
+        Integer maintenance_mileage=Mileage+mileageLastUpdate;
+        int result = vehicleMapper.updateMileageStatusByIdAndStatus(vehicleId, VehicleStatus.NORMAL.getCode(), VehicleStatus.UPKEEP.getCode(),maintenance_mileage);
         if (result == 0) {
             throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getCode());