123

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/RandomUtil.java

@@ -63,7 +63,7 @@ public class RandomUtil
 
 	public static void main(String[] args) {
 		int max = 20;
-		int n = 20;
+		int n = 30;
 		Set<Integer> set = new HashSet<>();
 		randomSet(max, n, set, n);
 		for(Integer a : set) {

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

@@ -198,10 +198,10 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-        }
+//        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
+//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
+//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+//        }
         Integer Mileagerest = vehicle.getMileageLastUpdate();
         Integer Mileagerest1 = arrivalVo.getMileage();
         if (Mileagerest1 == null) {
@@ -223,21 +223,33 @@ public class VehicleActiveService {
             vehicle.setExpectDestinationBranchCompanyId(0);
             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());
-            }
 
 
             // 出车记录
-            VehicleDepartureLog departureLog = vehicleDepartureLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
-            if (departureLog == null) {
+            VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
+
+            if (departureLogVo == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
+            // 修改状态，确认是出车状态
+            //兼容错误还车流程，先查询,是否有其他出行记录
+            boolean flag = true;
+            VehicleDepartureLog departureLog = departureLogVo.getVehicleDeparture(departureLogVo);
+            List<VehicleDepartureLogVo> list = vehicleDepartureLogMapper.selectByVehicleId(arrivalVo.getVehicleId());
+            for(VehicleDepartureLogVo vehicleDepartureLogVo : list) {
+                if(vehicleDepartureLogVo.getState() != 1 && departureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
+                    flag = false;
+                }
+            }
+            if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
+                int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
+                if (result == 0) {
+                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+                            ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+                }
+            }
+
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
             DateTime actualArrivalDate = new DateTime(new Date());
             //提前还车处理

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -29,6 +29,8 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     int updateStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
                                   @Param("lastStatus") Integer lastStatus);
 
+    int updateStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status);
+
     Vehicle selectByNumberPlate(String numberPlate);
 
     List<UsableVehicleModelVO> searchUsableModel(Map<String, Object> params);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -359,6 +359,12 @@
         where id = #{vehicleId} and status = #{lastStatus}
     </update>
 
+    <update id="updateStatus">
+        update vehicle
+        set status = #{status}
+        where id = #{vehicleId}
+    </update>
+
     <update id="updateMileageStatusByIdAndStatus">
         update vehicle
         set status = #{status},maintenance_mileage=#{mileage}