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

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.rest;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
@@ -661,6 +662,8 @@ 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()));
         }
 
         return RestResponse.data(vehicleVO);