邮件日志记录

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

@@ -237,13 +237,7 @@ public class VehicleActiveService {
                 vehicle.setStatus(VehicleStatus.NORMAL.getCode());
             }
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
-            //添加收车成功，后面有当天预定的记录时,取消当天的预定
-            Map<String, Object> map = new HashMap<>();
-            map.put("startTime", DateUtils.getStartOfDay());
-            map.put("endTime", DateUtils.getEndOfDay());
-            map.put("status", 1);
-            map.put("vehicleId", vehicleBookRecord.getVehicleId());
-            vehicleBookRecordBiz.selectAllBookRecord(map);
+
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
             DateTime actualArrivalDate = new DateTime(new Date());
             //提前还车处理
@@ -284,6 +278,11 @@ public class VehicleActiveService {
             if (vehicleBookRecord != null) {
                 departureLog.setArrivalBranchCompanyId(vehicleBookRecord.getRetCompany());
             }
+            //添加收车成功，后面有当天预定的记录时,取消当天的预定
+            boolean unBookStatus = unBookArrivalDateTime(vehicleBookRecord);
+            if (!unBookStatus) {
+                log.info("还车释放当天bookInfo失败！请手动修改！");
+            }
             vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
             // 车辆活动日志
             VehicleActiveLog activeLog = vehicleActiveLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
@@ -304,6 +303,46 @@ public class VehicleActiveService {
         vehicleDepartureLogMapper.insertSelective(vehicleDepartureLog);
     }
 
+    /**
+     * 如果还车时，还车当天还有其他预定记录，则不释放当天的bookInfo, 如果没有其他记录，则释放当天的bookInfo
+     * @param vehicleBookRecord
+     * @return
+     */
+    public boolean unBookArrivalDateTime(VehicleBookRecord vehicleBookRecord) {
+        Map<String, Object> map = new HashMap<>();
+        Date startDate = null;
+        if (vehicleBookRecord.getActualEndDate() == null) {
+            startDate = vehicleBookRecord.getBookEndDate();
+        } else {
+            startDate = vehicleBookRecord.getActualEndDate();
+        }
+        DateTime bookStartDate = new DateTime(startDate);
+        DateTime unBookEndDate = DateTime.now().withMillis(DateUtils.getEndOfDay());
+        map.put("startTime", bookStartDate.toString(DATE_TIME_FORMATTER));
+        map.put("endTime", unBookEndDate.toString(DATE_TIME_FORMATTER));
+        map.put("status", 1);
+        map.put("vehicleId", vehicleBookRecord.getVehicleId());
+        log.info("查询还车当天是否有其他预定记录：{}", map);
+        List<VehicleBookRecordVo> vehicleBookRecords = vehicleBookRecordBiz.selectAllBookRecord(map).getData();
+        if (vehicleBookRecords == null || vehicleBookRecords.size() <= 0) { //没有记录，取消记录
+            BookVehicleVO bookVehicleVO = new BookVehicleVO();
+            bookVehicleVO.setVehicleId(vehicleBookRecord.getVehicleId());
+            DateTime unBookStartDate = DateTime.now().withMillis(DateUtils.getStartOfDay());
+            bookVehicleVO.setUnbookStartDate(unBookStartDate.toString(DATE_TIME_FORMATTER));
+            bookVehicleVO.setUnbookEndDate(unBookEndDate.toString(DATE_TIME_FORMATTER));
+            log.info("释放还车当天bookInfo: {}", bookVehicleVO);
+            try {
+                return vehicleBiz.unbookVehicle(bookVehicleVO);
+            } catch (Exception e) {
+                log.info("还车释放当天bookInfo失败");
+                e.printStackTrace();
+            }
+        }
+            log.info("还车当天有其他预定记录，不释放当天bookInfo, {}", vehicleBookRecords);
+            return true;
+    }
+
+
     //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
     public void checkDateInvalid(VehicleDepartureVo arrivalVo) {
         if (arrivalVo.getBookRecordId() != null) {