Merge branch 'master-chw-price' into dev-chw

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

@@ -80,7 +80,7 @@ public class VehicleDaysPriceBiz extends BaseBiz<VehicleDaysPriceMapper, Vehicle
              if (days == null || days == 0){
                  vehicleDaysPriceVo = priceVos.stream().min(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
              }else {
-                 vehicleDaysPriceVo = priceVos.stream().filter(x -> x.getStartDay() >= days && x.getEndDay() >= days).min(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
+                 vehicleDaysPriceVo = priceVos.stream().filter(x -> x.getStartDay() <= days && (x.getEndDay() == -1 || x.getEndDay() >= days)).min(Comparator.comparing(VehicleDaysPriceVo::getPrice)).get();
              }
              if (vehicleDaysPriceVo != null )
                  price = vehicleDaysPriceVo.getPrice();