租车日历价格

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.biz;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.entity.Festival;
 import com.xxfc.platform.vehicle.entity.VehicleModelHolidayPrice;
 import com.xxfc.platform.vehicle.mapper.VehicleModelHolidayPriceMapper;
@@ -161,6 +162,17 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
         }
         List<Integer> festivalIds = modelHolidayPrices.stream().map(VehicleModelHolidayPrice::getFestivalId).collect(Collectors.toList());
         Map<Integer,Festival> festivalMap = festivalBiz.findFestivalsByIds(festivalIds);
+
+        Map<Date, List<VehicleModelHolidayPrice>> dateListMap = modelHolidayPrices.stream().collect(Collectors.groupingBy(VehicleModelHolidayPrice::getFestivalDay, Collectors.toList()));
+        modelHolidayPrices = dateListMap.values().stream().map(x->{
+            if (x.size()>1){
+                Optional<VehicleModelHolidayPrice> holidayPrice = x.stream().sorted(Comparator.comparing(VehicleModelHolidayPrice::getMultiple).reversed()).findFirst();
+                return Lists.newArrayList(holidayPrice.get());
+            }else {
+                return x;
+            }
+        }).flatMap(List::stream).collect(Collectors.toList());
+
         VehicleModelHolidayPriceDTO vehicleModelHolidayPriceDTO;
         for (VehicleModelHolidayPrice modelHolidayPrice : modelHolidayPrices) {
             vehicleModelHolidayPriceDTO = new VehicleModelHolidayPriceDTO();