Merge branch 'feature-delay-add' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderDelayBiz.java

@@ -128,8 +128,14 @@ public class OrderDelayBiz {
             List<VMCalendarPriceCostDTO> delayAmountList;
 
             if(delayAddDays > 0) {
+                VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
+                    setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                    setOrderId(orderPageVO.getId());
+                }}), VehicleItemDTO.class);
+                List<VMCalendarPriceCostDTO> vmcpcds = vehicleItemDTO.getVehicleDetail();
+
                 //获得延期天数费用
-                delayAmountList = orderItemBiz.getOverAmountList(DateUtil.date(orvd.getEndTime()), delayAddDays, orvd.getModelId(), orderPageVO.getUserId());
+                delayAmountList = orderItemBiz.getOverAmountList(vmcpcds.get(vmcpcds.size() - 1).getDate(), delayAddDays, orvd.getModelId(), orderPageVO.getUserId());
                 //处理免费天数和免费金额
                 delayAmountList.parallelStream().forEach( vmcpcd -> {
                     vmcpcd.setValidFreeDays(vmcpcd.getFreeDays());