Merge branch 'master-vehicle-status-limit' into dev

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

@@ -26,6 +26,7 @@ import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.constant.VehicleStatus;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
@@ -182,16 +183,19 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 return ObjectRestResponse.createFailedResult(3503, "无收车权限");
             }
         }
+        Vehicle vehicle = null;
+        RestResponse<Vehicle> vehicleRestResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
+        log.info("获取车辆信息返回消息：{}", vehicleRestResponse.getMessage());
+        if (vehicleRestResponse.getData() != null) {
+            vehicle = vehicleRestResponse.getData();
+        }
+        if (vehicle == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
+        }
+        if (vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc());
+        }
         if (baseOrder.getStatus() != -1) {
-            Vehicle vehicle = null;
-            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
-            log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
-            if (restResponse.getData() != null) {
-                vehicle = restResponse.getData();
-            }
-            if (vehicle == null) {
-                return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
-            }
             if (vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数
                 if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() < vehicle.getMileageLastUpdate()) {

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

@@ -69,7 +69,7 @@ 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.DISCARD.getCode()) || vehicle.getIsDel() == 1) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() == 1 || vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }

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

@@ -526,7 +526,7 @@
             </if>
             <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
             <if test="flag == true and status == 2">
-                and ( v4.id IS NOT NULL  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
+                and ( (v4.id IS NOT NULL and DATE_ADD(v1.book_end_date,INTERVAL '2' DAY) >= now())  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
             </if>
             and v1.book_user != -2
         </where>