修改申请接口

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -400,11 +400,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         detail.initDate();
         List<VehicleModelCalendarPriceDTO> metaVmcpds = vehicleFeign.getPriceByVehicleIdFeignV2(detail.getVehicleId(), detail.getStartDateStr(), detail.getEndDateStr(), dto.getUserid(), detail.getStartCompanyId()).getData();
-//        List<VehicleModelCalendarPriceDTO> metaVmcpds = vehicleFeign.findVehicleModelCalendarPriceByDate(detail.getStartTime(), detail.getEndTime(), detail.getModelId(), dto.getUserid()).getData();
-//        List<VehicleModelCalendarPriceDTO> metaVmcpds;
-//        for (VehicleHolidayPriceInfo vhpi : vhpis) {
-//            vhpi.getAllModelUse()
-//        }
+
         List<VMCalendarPriceCostDTO> vmcpds = Convert.toList(VMCalendarPriceCostDTO.class, metaVmcpds);
 
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -238,7 +238,7 @@ public interface VehicleFeign {
     public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getPriceByVehicleIdFeign(
             @RequestParam("vehicleId") String vehicleId, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("userId") Integer userId, @RequestParam("companyId") Integer companyId);
 
-    @GetMapping(value = "/vehicleInfo/getPriceByVehicleFeign")
+    @GetMapping(value = "/vehicleInfo/v2/getPriceByVehicleFeign")
     public ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getPriceByVehicleIdFeignV2(
             @RequestParam("vehicleId") String vehicleId, @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("userId") Integer userId, @RequestParam("companyId") Integer companyId);
 

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

@@ -397,9 +397,9 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         return ObjectRestResponse.succ(vehicleBookRecord);
     }
 
-    @GetMapping(value = "getPriceByVehicleFeign")
+    @GetMapping(value = "v2/getPriceByVehicleFeign")
     @IgnoreUserToken
-    public  ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getByVehicleIdFeign(String vehicleId, String startDate, String endDate, Integer userId, Integer companyId) {
+    public  ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getByVehicleIdFeignV2(String vehicleId, String startDate, String endDate, Integer userId, Integer companyId) {
         return ObjectRestResponse.succ(getSynthesizePrice(vehicleId, startDate, endDate, userId, companyId));
     }