修改还车未取消预定数据bug

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -368,7 +368,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
         long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
-        if (time <= startTime + 24 * 60 * 60 * 1000 - 1) {
+        if (startTime <= time ) {
             return true;
         }
         return false;

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

@@ -28,6 +28,7 @@ public enum ResCode {
     USERNAME_AND_TELE_NOT_NULL(104000, "使用人和电话不能为空"),
     VEHICLE_DEPARTURE_VEHICLE_UNEXIST(104001,"车辆不存在"),
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
+    VEHICLE_DEPARTURE_VEHICLE_DELETE(104007,"车辆已下架"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
     VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"车辆不在出车范围内，请按照预定日期出车！"),
 

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

@@ -416,10 +416,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
+        if (vehicle.getIsDel() == 1) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DELETE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DELETE.getCode());
+        }
         if(StringUtils.isBlank(bookVehicleVo.getBookStartDate()) || StringUtils.isBlank(bookVehicleVo.getBookEndDate())) {
             throw new BaseException(ResultCode.DATE_TIME_IS_NULL);
         }