预订时间处理bug

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

@@ -167,33 +167,35 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         List<VehicleBookRecord> list = vehicleBookRecordBiz.selectListAll();
         if(CollectionUtils.isNotEmpty(list)) {
             for(VehicleBookRecord vehicleBookRecord : list) {
-                Map<String, Integer> map = getPredictableHours(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER), new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER), Boolean.TRUE);
-                for(Map.Entry<String, Integer> entry : map.entrySet()) {
-                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
-                    vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
-                    List<VehicleBookHourInfo> vehicleBookHourInfoList = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
-                    log.info("获取到的小时信息： vehicleBookHourInfoList = {}", vehicleBookHourInfoList);
-                    if(CollectionUtils.isNotEmpty(vehicleBookHourInfoList)) {
-                        if(entry.getValue() == 0){ //0点
-                            vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() | 1);
-                            updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
-                        } else {
-                            if((vehicleBookHourInfoList.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
-                                log.info("已经预订时间正确，右移一位，原数据为：{}， 修改后的数据为： {}", vehicleBookHourInfoList.get(0).getBookedHour(), vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
-                                vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
+                if(vehicleBookRecord.getStatus() == 2 || (vehicleBookRecord.getStatus() == 1 && vehicleBookRecord.getBookUser() != -2)) {
+                    Map<String, Integer> map = getPredictableHours(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER), new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER), Boolean.TRUE);
+                    for(Map.Entry<String, Integer> entry : map.entrySet()) {
+                        VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
+                        vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
+                        vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
+                        List<VehicleBookHourInfo> vehicleBookHourInfoList = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
+                        log.info("获取到的小时信息： vehicleBookHourInfoList = {}", vehicleBookHourInfoList);
+                        if(CollectionUtils.isNotEmpty(vehicleBookHourInfoList)) {
+                            if(entry.getValue() == 0){ //0点
+                                vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() | 1);
                                 updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
                             } else {
-                                vehicleBookHourInfos.add(vehicleBookRecord);
+                                if((vehicleBookHourInfoList.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) {
+                                    log.info("已经预订时间正确，右移一位，原数据为：{}， 修改后的数据为： {}", vehicleBookHourInfoList.get(0).getBookedHour(), vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
+                                    vehicleBookHourInfoList.get(0).setBookedHour(vehicleBookHourInfoList.get(0).getBookedHour() >> 1);
+                                    updateSelectiveByIdRe(vehicleBookHourInfoList.get(0));
+                                } else {
+                                    vehicleBookHourInfos.add(vehicleBookRecord);
+                                }
                             }
+                        } else { //如果数据不存在就补充进去
+                            VehicleBookHourInfoDto vehicleBookHourInfoDto1 = new VehicleBookHourInfoDto();
+                            vehicleBookHourInfoDto1.setVehicleId(vehicleBookRecord.getVehicleId());
+                            vehicleBookHourInfoDto1.setYearMonthDay(entry.getKey());
+                            vehicleBookHourInfoDto1.setBookedHour(entry.getValue());
+                            vehicleBookHourInfoDto1.setBookRecordId(vehicleBookRecord.getId());
+                            save(vehicleBookHourInfoDto1);
                         }
-                    } else { //如果数据不存在就补充进去
-                        VehicleBookHourInfoDto vehicleBookHourInfoDto1 = new VehicleBookHourInfoDto();
-                        vehicleBookHourInfoDto1.setVehicleId(vehicleBookRecord.getVehicleId());
-                        vehicleBookHourInfoDto1.setYearMonthDay(entry.getKey());
-                        vehicleBookHourInfoDto1.setBookedHour(entry.getValue());
-                        vehicleBookHourInfoDto1.setBookRecordId(vehicleBookRecord.getId());
-                        save(vehicleBookHourInfoDto1);
                     }
                 }
             }