Merge branch 'holiday-price' into base-modify

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

 package com.xxfc.platform.vehicle.rest;
 
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleModelCalendarPriceBiz;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -20,20 +29,27 @@ import java.util.List;
  * @data 2019/10/14 17:35
  */
 @RestController
-@RequestMapping("/vehicle_model/calendar_price")
+@RequestMapping("/vehicle_model/calendar_price/app/unauth")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 @Api(tags = "车型日历价格")
-public class VehicleModelCalendarPriceController {
+public class VehicleModelCalendarPriceController{
 
      private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
 
 
      @ApiOperation("返回车型日历价格")
-     @GetMapping("/list/vehicle_model/calendar_price/{vehicleModelId}/{type}")
-     public ObjectRestResponse<VehicleModelCalendarPriceDTO> listVehicleModelCalendarPriceByDateAndVehicleModelId(@RequestParam(value = "start",required = false) Date startDate,
-                                                                                                                 @RequestParam(value = "end",required = false) Date endDate,
+     @GetMapping("/list/{vehicleModelId}")
+     @IgnoreUserToken
+     @SneakyThrows
+     public ObjectRestResponse<VehicleModelCalendarPriceDTO> listVehicleModelCalendarPriceByDateAndVehicleModelId(@RequestParam(value = "start",required = false) String start,
+                                                                                                                 @RequestParam(value = "end",required = false) String end,
                                                                                                                  @PathVariable(value = "vehicleModelId") Integer vehicleModelId,
                                                                                                                  AppUserDTO appUserDTO){
+          if (StringUtils.isEmpty(start) || StringUtils.isEmpty(end)){
+               throw  new BaseException("缺少开始时间或结束时间");
+          }
+          Date startDate= Date.from(LocalDate.parse(start).atStartOfDay(ZoneId.systemDefault()).toInstant());
+          Date endDate= Date.from(LocalDate.parse(end).atStartOfDay(ZoneId.systemDefault()).toInstant());
           List<VehicleModelCalendarPriceDTO> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate,endDate,vehicleModelId,appUserDTO.getUserid());
           return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
      }