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

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

@@ -663,7 +663,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         if(StrUtil.isNotBlank(priceStartDate) && StrUtil.isNotBlank(priceEndDate)) {
             vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), priceStartDate, priceEndDate, null, vehicleVO.getSubordinateBranch()));
         }else {
-            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), DateUtil.today(), DateUtil.offsetDay(DateUtil.date(), 7).toDateStr(), null, vehicleVO.getSubordinateBranch()));
+            vehicleVO.setPriceDTOS(vehicleHolidayPriceInfoBiz.getSynthesizePrice(vehicleVO.getId(), DateUtil.today(), DateUtil.offsetDay(DateUtil.date(), 6).toDateStr(), null, vehicleVO.getSubordinateBranch()));
         }
 
         return RestResponse.data(vehicleVO);

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

@@ -52,22 +52,22 @@ public class VehicleHolidayPriceInfoController extends BaseController<VehicleHol
 
 	@GetMapping(value = "multiCalendarPrice")
 	@IgnoreUserToken
-	public ObjectRestResponse<List<VehicleVO>> multiCalendarPrice(String startDate, String endDate, Integer companyId) {
+	public ObjectRestResponse<List<VehicleVO>> multiCalendarPrice(String vehicleIds, String startDate, String endDate) {
 		Integer userId = Integer.valueOf(getCurrentUserId());
 
 		List<VehicleVO> vehicleVOS = CollUtil.newArrayList();
-//		if(StrUtil.isNotBlank(vehicleIds)) {
-//			String[] strs = StrUtil.split(vehicleIds, ",");
-//			List<Vehicle> vehicleList = vehicleBiz.selectByWeekend(w -> {
-//				w.andIn(Vehicle::getId, CollUtil.toList(strs));
-//				return w;
-//			});
-//			for (Vehicle vehicle : vehicleList) {
-//				VehicleVO vehicleVO = BeanUtil.toBean(vehicle, VehicleVO.class);
-//				vehicleVO.setPriceDTOS(baseBiz.getSynthesizePrice(vehicle.getId(), startDate, endDate, userId, companyId));
-//				vehicleVOS.add(vehicleVO);
-//			}
-//		}
+		if(StrUtil.isNotBlank(vehicleIds)) {
+			String[] strs = StrUtil.split(vehicleIds, ",");
+			List<Vehicle> vehicleList = vehicleBiz.selectByWeekend(w -> {
+				w.andIn(Vehicle::getId, CollUtil.toList(strs));
+				return w;
+			});
+			for (Vehicle vehicle : vehicleList) {
+				VehicleVO vehicleVO = BeanUtil.toBean(vehicle, VehicleVO.class);
+				vehicleVO.setPriceDTOS(baseBiz.getSynthesizePrice(vehicle.getId(), startDate, endDate, userId, vehicle.getSubordinateBranch()));
+				vehicleVOS.add(vehicleVO);
+			}
+		}
 		return ObjectRestResponse.succ(vehicleVOS);
 	}