Merge branch 'master-zjw'

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

@@ -47,4 +47,10 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
      * 创建用户 -1+后台用户id 后台系统
      */
     String crtUser;
+
+    /**
+     * 用途 1 租车
+     */
+    @ApiModelProperty(hidden = true)
+    Integer useType = 1;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -74,6 +74,7 @@ public class OrderRentVehicleController extends CommonBaseController {
 
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
+                bo.setUseType(null);
                 orderRentVehicleService.createOrder(bo);
                 return ObjectRestResponse.succ(bo.getOrder());
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -459,6 +459,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rentVehicleBookDTO.setOrderNo(detail.getOrder().getNo());
         rentVehicleBookDTO.setNumberPlate(numberPlate);
         rentVehicleBookDTO.setStatus(status);
+        rentVehicleBookDTO.setUseType(detail.getUseType());
+
         if(null != detail.getAccompanyItems()) {
             rentVehicleBookDTO.setSelectedAccItem(detail.getAccompanyItems().parallelStream().collect(Collectors.toMap(OrderAccompanyDTO::getId, OrderAccompanyDTO::getNum)));
         }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

@@ -91,6 +91,12 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("扩展结束时间")
     String endDateExtend;
 
+    /**
+     * 用途 1 租车
+     */
+    @ApiModelProperty(hidden = true)
+    Integer useType = 1;
+
     public void setBookStartDate(String bookStartDate) {
         this.bookStartDate = bookStartDate;
         //首次设置

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java

@@ -57,6 +57,12 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty(hidden = true)
         Integer withoutRecordWhere = 1;
 
+        /**
+         * 用途 1 租车
+         */
+        @ApiModelProperty(hidden = true)
+        Integer useType = 1;
+
         public void setStartDateTamp(Long startDateTamp) {
             this.startDateTamp = startDateTamp;
             this.startDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)));

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

@@ -125,6 +125,27 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
     }
 
+    /**
+     * 后台查询可用车辆(车型)
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation("可用车辆查询")
+    @RequestMapping(value = "/rent/back-stage/usable-vehicle", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> rentBgUsableVehicle(UsableVeicleDTO dto) throws Exception {
+        //根据时间 获得 可用车辆
+        //结合车型
+        if (StringUtils.isNotBlank(dto.getCatasStr())) {
+            dto.setCatas(vehiclePlatCataBiz.groupCatasByParent(dto.getCatasStr()));
+        }
+        //设置显示是否有车
+        dto.setYearNo4Where(Boolean.TRUE);
+        dto.setUseType(null);
+        return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
+    }
+
     /**
      * 热门车型
      *

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

@@ -682,6 +682,9 @@
             </if>
             and v.is_del = 0
             and v.status != 3
+            <if test="useType != null">
+                and v.use_type = #{useType}
+            </if>
             and v.use_type = 1
             and bc.is_del = 0
             and bc.is_show = 1