Merge branch 'holiday-price' into dev

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

@@ -240,7 +240,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         VehicleModel vehicleModel = vehicleFeign.get(detail.getModelId()).getData();
 
         detail.initDate();
-        List<VehicleModelCalendarPriceDTO> vmcpds = vehicleFeign.findVehicleModelCalendarPriceByDate(detail.getStartTime(), detail.getEndTime(), detail.getModelId(), dto.getUserid()).getData();
+        List<VehicleModelCalendarPriceDTO> metaVmcpds = vehicleFeign.findVehicleModelCalendarPriceByDate(detail.getStartTime(), detail.getEndTime(), detail.getModelId(), dto.getUserid()).getData();
+        List<VMCalendarPriceCostDTO> vmcpds = Convert.toList(VMCalendarPriceCostDTO.class, metaVmcpds);
 
 
         //设置Item
@@ -284,6 +285,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             vehicleDayNum = detail.getDayNum();
         }
 
+        vmcpds = vehicleOrderItem.getVehicleDetail();
         detail.setFreeDays(freeDayNum);
 
         //计算价格
@@ -330,7 +332,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //计算价格
         if(vehicleDayNum > 0) {
             for(int i = offsetNum; i < vmcpds.size(); i++) {
-                vehicleAmount = vehicleAmount.add(vmcpds.get(i).getPrice());
+                vehicleAmount = vehicleAmount.add(vmcpds.get(i).getConsumeAmount());
                 metaVehicleAmount = metaVehicleAmount.add(vmcpds.get(i).getNo_discount_price());
             }
         }else {

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

@@ -48,8 +48,8 @@ public class VehicleModelCalendarPriceController {
         if (StringUtils.isEmpty(start) || StringUtils.isEmpty(end)) {
             throw new BaseException("缺少开始时间或结束时间");
         }
-        Date startDate = Date.from(LocalDateTime.parse(start, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toInstant(ZoneOffset.ofHours(8)));
-        Date endDate = Date.from(LocalDateTime.parse(end,DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toInstant(ZoneOffset.ofHours(8)));
+        Date startDate = Date.from(LocalDateTime.parse(start, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")).toInstant(ZoneOffset.ofHours(8)));
+        Date endDate = Date.from(LocalDateTime.parse(end,DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")).toInstant(ZoneOffset.ofHours(8)));
         List<VehicleModelCalendarPriceDTO> vehicleModelCalendarPriceVos = vehicleModelCalendarPriceBiz.listVehicleModelCalendarPriceByDateAndVehicleModelIdAndUserId(startDate, endDate, vehicleModelId, appUserDTO.getUserid());
         return ObjectRestResponse.succ(vehicleModelCalendarPriceVos);
     }