修改租车触发预约代码

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

@@ -26,6 +26,7 @@ import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import com.xxfc.platform.order.pojo.order.*;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
@@ -316,7 +317,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         }}).getDetail()), OrderAccompanyDTO.class);
         bo.setAccompanyItems(oads);
         Long oldBookRecordId = bo.getBookRecordId();
-        orderRentVehicleService.acquireVehicle(bo, dto.getNumberPlate());
+        orderRentVehicleService.acquireVehicle(bo, dto.getNumberPlate(), VehicleBookRecordStatus.APPROVE.getCode());
         //如果成功则取消旧车的预约
         vehicleFeign.rentUnbookVehicle(oldBookRecordId);
         //设置新的vehicleId 和 record

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

@@ -188,7 +188,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         bo.setAccompanyItems(oads);
 
         //获取可用车辆
-        acquireVehicle(bo, null);
+        acquireVehicle(bo, null, null);
 
         OrderItem accompanyItem = orderItemBiz.initOrderItem(BigDecimal.ZERO, 1, "随车物品", null, ACCOMPANY);
         accompanyItem.setRealAmount(BigDecimal.ZERO);
@@ -412,7 +412,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         vo.setCostDetail(result);
     }
 
-    public void acquireVehicle(RentVehicleBO detail, String numberPlate) {
+    public void acquireVehicle(RentVehicleBO detail, String numberPlate, Integer status) {
         //根据车型、时间、距离，门店，预定车辆
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
         rentVehicleBookDTO.setModelId(detail.getModelId());

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

@@ -63,6 +63,9 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("指定车牌")
     String numberPlate;
 
+    @ApiModelProperty("指定预约状态")
+    Integer status;
+
     /**
      * 随车物品id以及数量 List<Map<id,数量>>
      */

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

@@ -1094,8 +1094,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getStartDate())&&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
-                    dto.getEndDateExtend());
+            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
+                    dto.getEndDate());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

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

@@ -183,7 +183,11 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         BookVehicleVO bookVehicleVo = BeanUtil.toBean(dto, BookVehicleVO.class);
         bookVehicleVo.setBookType(BookType.USER_RENT.getCode());
         bookVehicleVo.setVehicleId(bookVehicleId);
-        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        if(null != dto.getStatus()) {
+            bookVehicleVo.setStatus(dto.getStatus());
+        }else {
+            bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        }
         VehicleBookRecord vehicleBookRecord = baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return ObjectRestResponse.succ(vehicleBookRecord);
     }