Merge branch 'holiday-price' into base-modify

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

@@ -270,12 +270,12 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
                             break;
                         default:
                             break;
-                    }
+                     }
                     free_days = vehicleModelCalendarPrice.getFreeDays();
                 }
-                vehicleModelCalendarPriceDTO.setPrice(vehicle_price);
-                vehicleModelCalendarPriceDTO.setFreeDays(free_days);
             }
+            vehicleModelCalendarPriceDTO.setPrice(vehicle_price);
+            vehicleModelCalendarPriceDTO.setFreeDays(free_days);
             final_startLocalDate = final_startLocalDate.plusDays(1);
             vehicleModelCalendarPriceVos.add(vehicleModelCalendarPriceDTO);
         }
@@ -295,6 +295,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("isDel", 0);
         criteria.andEqualTo("vehicleModelId", vehicleModelId);
+        criteria.orIsNull("vehicleModelId");
         criteria.andBetween("vehicleModelDay", final_startDate, final_endDate);
         List<VehicleModelCalendarPrice> vehicleModelCalendarPrices = mapper.selectByExample(example);
         return CollectionUtils.isEmpty(vehicleModelCalendarPrices) ? Collections.EMPTY_LIST : vehicleModelCalendarPrices;