修改查询

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

@@ -63,8 +63,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
-    public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
+    public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final DateTimeFormatter YEARMONTH_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM");
     /**
      * 允许查询预定信息的最大月份数
@@ -322,16 +322,16 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
         vehicleBookRecordMapper.insertSelective(vehicleBookRecord);
 
-        //添加预定时间记录
-
-            Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
-            for(Map.Entry<String, Integer> entry : map.entrySet()) {
-                VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-                vehicleBookHourInfoDto.setVehicleId(bookVehicleVo.getVehicleId());
-                vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
-                vehicleBookHourInfoDto.setBookedHour(entry.getValue());
-                vehicleBookHourInfoBiz.save(vehicleBookHourInfoDto);
-            }
+//        //添加预定时间记录
+//
+//            Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
+//            for(Map.Entry<String, Integer> entry : map.entrySet()) {
+//                VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+//                vehicleBookHourInfoDto.setVehicleId(bookVehicleVo.getVehicleId());
+//                vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+//                vehicleBookHourInfoDto.setBookedHour(entry.getValue());
+//                vehicleBookHourInfoBiz.save(vehicleBookHourInfoDto);
+//            }
 
         //修改相关车辆预定记录
         Boolean hasSuc = bookedVehicle(bookVehicleVo);
@@ -406,15 +406,15 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 //                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
 //            }
 //        }
-        //如果拒绝预定，删除预定时间记录
-        if(VehicleBookRecordStatus.APPLY.getCode().equals(vehicleBookRecord.getStatus())) {
-            //删除预定时间记录
-            List<String> list = null;
-            for( DateTime curDate = new DateTime(vehicleBookRecord.getBookStartDate());curDate.compareTo(new DateTime(vehicleBookRecord.getBookEndDate()))<=0;curDate=curDate.plusDays(1)) {
-                list.add(curDate.toString(DEFAULT_DATE_TIME_FORMATTER));
-            }
-            vehicleBookHourInfoBiz.delete(vehicleBookRecord.getVehicleId(),list);
-        }
+//        //如果拒绝预定，删除预定时间记录
+//        if(VehicleBookRecordStatus.APPLY.getCode().equals(vehicleBookRecord.getStatus())) {
+//            //删除预定时间记录
+//            List<String> list = null;
+//            for( DateTime curDate = new DateTime(vehicleBookRecord.getBookStartDate());curDate.compareTo(new DateTime(vehicleBookRecord.getBookEndDate()))<=0;curDate=curDate.plusDays(1)) {
+//                list.add(curDate.toString(DEFAULT_DATE_TIME_FORMATTER));
+//            }
+//            vehicleBookHourInfoBiz.delete(vehicleBookRecord.getVehicleId(),list);
+//        }
         //成功后修改预定记录状态
         Map<String,Object> updateParam = Maps.newHashMap();
         updateParam.put("id",bookRecordId);
@@ -470,16 +470,16 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚
             return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
         }
-        //删除预定时间记录
-        List<String> list = Lists.newArrayList();
-        DateTime startDay = DateTime.parse(bookVehicleVo.getUnbookStartDate().split(" ")[0], DATE_TIME_FORMATTER);
-        DateTime endDay = DateTime.parse(bookVehicleVo.getUnbookEndDate().split(" ")[0], DATE_TIME_FORMATTER);
-        for( DateTime curDate = startDay;curDate.compareTo(endDay) <= 0; curDate=curDate.plusDays(1)) {
-            log.info("当前日期：" + curDate);
-            String date = curDate.toString(DATE_TIME_FORMATTER);
-            list.add(date);
-        }
-         vehicleBookHourInfoBiz.delete(vehicleBookRecord.getVehicleId(), list);
+//        //删除预定时间记录
+//        List<String> list = Lists.newArrayList();
+//        DateTime startDay = DateTime.parse(bookVehicleVo.getUnbookStartDate().split(" ")[0], DEFAULT_DATE_TIME_FORMATTER);
+//        DateTime endDay = DateTime.parse(bookVehicleVo.getUnbookEndDate().split(" ")[0], DEFAULT_DATE_TIME_FORMATTER);
+//        for( DateTime curDate = startDay;curDate.compareTo(endDay) <= 0; curDate=curDate.plusDays(1)) {
+//            log.info("当前日期：" + curDate);
+//            String date = curDate.toString(DATE_TIME_FORMATTER);
+//            list.add(date);
+//        }
+//         vehicleBookHourInfoBiz.delete(vehicleBookRecord.getVehicleId(), list);
         return RestResponse.suc();
     }