Merge branch 'master-arrival-bug' into dev

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

@@ -250,7 +250,8 @@ public class VehicleActiveService {
                 bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
                 bookVehicleVo.setUnbookEndDate(arrivalDate.toString(DATE_TIME_FORMATTER));
                 bookVehicleVo.setRemark(bookVehicleVo.getRemark()==null?"": bookVehicleVo.getRemark()+ "  用户提前还车，取消剩余天数, 初始预定结束时间是，" + new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
-                vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
+				vehicleBookRecord.setBookEndDate(new Date());
+				vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
                 try {
                     Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
                     if (!hasSuc) {

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

@@ -992,6 +992,9 @@
         , vbre.ret_company as to_lift_company
         , vbrs.lift_company as to_return_company
         from
+        <!--
+            查询开始时间 前面的最后一条 预约记录
+            查询结束时间 后面的第一条 预约记录 -->
         (select vehicle_id, max(if(book_end_date &lt; #{startDateExtend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date &gt; #{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