Merge branch 'master-tiande' of...

Merge branch 'master-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into master-tiande

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

@@ -159,9 +159,11 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 		List<VehicleModelCalendarPriceDTO> priceDTOS = CollUtil.newArrayList();
 		cn.hutool.core.date.DateTime beginOfStartDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
 		cn.hutool.core.date.DateTime endOfStartDate = DateUtil.endOfDay(DateUtil.parse(endDate));
+		//查询车辆信息
+		Vehicle vehicle = vehicleBiz.selectById(vehicleId);
 		//获取基本和周末价格
 		VehicleCommonPriceInfo vehicleCommonPriceInfo = vehicleCommonPriceInfoBiz.selectOne(new VehicleCommonPriceInfo(){{
-			setCompanyId(companyId);
+			setCompanyId(vehicle.getSubordinateBranch());
 			setVehicleId(vehicleId);
 		}});
 
@@ -207,8 +209,6 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 
 
 		//获取会员折扣
-			//查询车辆信息
-		Vehicle vehicle = vehicleBiz.selectById(vehicleId);
 			//查询会员信息
 		//默认折扣
 		Integer discount = DEFAULT_DISCOUNT;