修改代码

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

 package com.xxfc.platform.order.rest;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -14,16 +16,21 @@ import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderItemBiz;
+import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
-import com.xxfc.platform.order.pojo.order.OrderListVo;
-import com.xxfc.platform.order.pojo.order.OrderPageVO;
-import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
-import com.xxfc.platform.order.pojo.order.QueryOrderDTO;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+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.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.QueryMultiDTO;
 import io.swagger.annotations.Api;
@@ -31,14 +38,20 @@ import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.mockito.internal.util.collections.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.xxfc.platform.order.pojo.AddRentVehicleDTO.DEFAULT_DATE_TIME_FORMATTER;
+
 @Controller
 @RequestMapping("baseOrder")
 @Api(value = "订单后台相关", tags = {"订单后台相关"})
@@ -49,9 +62,18 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+
     @Autowired
     OrderUserLicenseBiz orderUserLicenseBiz;
 
+    @Autowired
+    OrderRentVehicleService orderRentVehicleService;
+
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -271,14 +293,31 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> changeVehicle(@RequestBody ChangeVehicleDTO dto) {
         checkAdminUser();
-        //根据订单号获取订单
-        //查询列表数据
+//        //根据订单号获取订单
+//        //查询列表数据
 //        Query query = baseOrderBiz.initQuery(dto.getNo());
 //        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+//        OrderPageVO orderPageVO = page.getData().get(0);
+//        if(null == orderPageVO) {
+//            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("订单不存在"));
+//        }
 //            //预约新的车辆
-//        vehicleFeign.rentApplyVehicle()
-//        page.getData().get(0).getOrderRentVehicleDetail().getVehicleId()
-        //如果成功则取消旧车的预约
+//        RentVehicleBO bo = BeanUtil.toBean(orderPageVO.getOrderRentVehicleDetail(), RentVehicleBO.class);
+//        bo.setOrder(orderPageVO);
+//        bo.setBookVehicleVO(new BookVehicleVO(){{
+//            setBookStartDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
+//            setBookEndDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
+//        }});
+//
+//        List<OrderAccompanyDTO> oads = JSONUtil.toList(JSONUtil.parseArray(orderItemBiz.selectOne(new OrderItem(){{
+//            setOrderId(orderPageVO.getId());
+//            setType(ItemTypeEnum.ACCOMPANY.getCode());
+//        }}).getDetail()), OrderAccompanyDTO.class);
+//        bo.setAccompanyItems(oads);
+//        orderRentVehicleService.acquireVehicle(bo);
+//        //如果成功则取消旧车的预约
+//
+//        orderRentVehicle
         return ObjectRestResponse.succ();
     }
 

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

@@ -412,7 +412,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         vo.setCostDetail(result);
     }
 
-    private void acquireVehicle(RentVehicleBO detail) {
+    public void acquireVehicle(RentVehicleBO detail) {
         //根据车型、时间、距离，门店，预定车辆
         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/UsableVeicleDTO.java

@@ -27,9 +27,9 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty(hidden = true)
         String endDate;
         @ApiModelProperty(hidden = true)
-        String beforeStartDate;
+        String startDateExtend;
         @ApiModelProperty(hidden = true)
-        String afterEndDate;
+        String endDateExtend;
         @ApiModelProperty("开始时间戳")
         Long startDateTamp;
         @ApiModelProperty("结束时间戳")
@@ -57,12 +57,12 @@ public class UsableVeicleDTO extends PageParam {
         public void setStartDateTamp(Long startDateTamp) {
             this.startDateTamp = startDateTamp;
             this.startDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)));
-            this.beforeStartDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)).minusDays(1L));
+            this.startDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)).minusDays(1L));
         }
 
         public void setEndDateTamp(Long endDateTamp) {
                 this.endDateTamp = endDateTamp;
                 this.endDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)));
-                this.afterEndDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)).plusDays(1L));
+                this.endDateExtend = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(endDateTamp), ZoneOffset.ofHours(8)).plusDays(1L));
         }
 }
\ No newline at end of file

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.getBeforeStartDate(),
-                    dto.getAfterEndDate());
+            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                    dto.getEndDateExtend());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

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

@@ -655,7 +655,7 @@
         , vbre.ret_company as to_lift_company
         , vbrs.lift_company as to_return_company
         from
-        (select vehicle_id, max(if(book_end_date < #{start_date_extend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date > #{end_date_extend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
+        (select vehicle_id, max(if(book_end_date < #{startDateExtend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date > #{endDateExtend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
         left join vehicle_book_record vbre
         on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
         left join vehicle_book_record vbrs