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

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

@@ -26,7 +26,6 @@ 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;
@@ -192,9 +191,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         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 (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) {
             if (vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数

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

@@ -49,6 +49,8 @@ public enum ResCode {
     VEHICLE_UPKEEP_VEHICLE_DISABLE(106002,"车辆不可用"),
     VEHICLE_UPKEEP_ITEM_UNEXIST(106003, "保养项目不存在"),
     VEHICLE_UPKEEP_VEHICLE_UNUPKEEP(106004, "车辆不在保养中"),
+    VEHICLE_STATUS_IS_NOT_NORMAL(106005, "上次的出行未做收车操作, 请先收车"),
+
 
     VEHICLE_IS_BOOKED_TODAY(106006, "车辆当前时段已经被预定"),
     FIND_VEHICLE_PLAT_FAILE(106007, "获取车型列表失败"),

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

@@ -491,6 +491,25 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return Boolean.TRUE;
     }
 
+    /**
+     *
+     * @param vehicleId
+     * @return
+     */
+    public ObjectRestResponse checkVehicleStatus(String vehicleId) {
+        if (StringUtils.isNotBlank(vehicleId)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        Vehicle vehicle = mapper.selectByPrimaryKey(vehicleId);
+        if (vehicle == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_UPKEEP_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_UPKEEP_VEHICLE_UNUPKEEP.getDesc());
+        }
+        if (vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode()) || vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() != 0) {
+            return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getCode(), ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getDesc());
+        }
+        return ObjectRestResponse.succ();
+    }
+
 
     public boolean filterHourInfoBooked(String vehicleId, Map<String, Integer> hourInfo) {
         if (MapUtils.isEmpty(hourInfo)) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -485,6 +485,12 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(map);
     }
 
+    @GetMapping(value = "/app/unauth/checkVehicleStatus")
+    @ApiOperation(value = "检车车辆状态是否是正常状态")
+    public ObjectRestResponse checkVehicleStatus(String vehicleId) {
+        return vehicleBiz.checkVehicleStatus(vehicleId);
+    }
+
     /**
      * 保存
      *