Merge branch 'master-vehicle-price' into dev-tiande

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

@@ -74,7 +74,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 			vehicleList = vehicleBiz.getAllVehicleByCompanyId(vehicle.getSubordinateBranch(), null);
 		}
 		if (vehicleList == null || vehicleList.size() <= 0) { //单个车辆可用
-			for(String date : getAllDate(vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate())) {
+			for(String date : getAllDate(vehicleHolidayPriceInfo.getStartTime(), vehicleHolidayPriceInfo.getEndTime())) {
 				vehicleHolidayPriceInfo.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
 				VehicleHolidayPriceInfo oldValue = getByVehicleId(vehicleHolidayPriceInfo.getVehicleId(),  date);
 				if (oldValue == null) {
@@ -89,7 +89,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 		}  else {
 			vehicleList.parallelStream().forEach(vehicleInfo -> {
 				if (vehicleInfo != null) {
-					for(String date : getAllDate(vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate())) {
+					for(String date : getAllDate(vehicleHolidayPriceInfo.getStartTime(), vehicleHolidayPriceInfo.getEndTime())) {
 						VehicleHolidayPriceInfo oldValue = getByVehicleId(vehicleInfo.getId(),  date);
 						vehicleHolidayPriceInfo.setFestivalDate(DateTime.parse(date, DATE_TIME_FORMATTER).toDate());
 						vehicleHolidayPriceInfo.setVehicleId(vehicleInfo.getId());
@@ -125,7 +125,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 		List<VehicleHolidayPriceInfo> vehicleHolidayPriceInfoList = new ArrayList<>();
 		if (list.size() > 0) {
 			for (VehicleHolidayPriceInfo vehicleHolidayPriceInfo : list) {
-				vehicleHolidayPriceInfoList.addAll(getByVehicleIdAndDate(vehicleHolidayPriceInfo.getVehicleId(), vehicleHolidayPriceInfo.getStartDate(), vehicleHolidayPriceInfo.getEndDate()));
+				vehicleHolidayPriceInfoList.addAll(getByVehicleIdAndDate(vehicleHolidayPriceInfo.getVehicleId(), vehicleHolidayPriceInfo.getStartTime(), vehicleHolidayPriceInfo.getEndTime()));
 			}
 		}
 		return ObjectRestResponse.succ(vehicleHolidayPriceInfoList);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleHolidayPriceInfoController.java

@@ -27,8 +27,8 @@ public class VehicleHolidayPriceInfoController extends BaseController<VehicleHol
 	}
 
 	@GetMapping(value = "getByVehicleId")
-	public  ObjectRestResponse getByVehicleId(String vehicleId, String startDate, String endDate) {
-		return ObjectRestResponse.succ(baseBiz.getByVehicleIdAndDate(vehicleId, startDate, endDate));
+	public  ObjectRestResponse getByVehicleId(String vehicleId, String startTime, String endTime) {
+		return ObjectRestResponse.succ(baseBiz.getByVehicleIdAndDate(vehicleId, startTime, endTime));
 	}
 
 	@GetMapping(value = "getByVehicleIdFeign")