Commit 1ed763f8 authored by 周健威's avatar 周健威

Merge branch 'holiday-price' into dev

parents f293b09d bf70fadb
...@@ -55,9 +55,8 @@ public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> { ...@@ -55,9 +55,8 @@ public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
public List<VMCalendarPriceCostDTO> getOverAmountList(Date endDate, Integer overDays, Integer modelId, Integer userId) { public List<VMCalendarPriceCostDTO> getOverAmountList(Date endDate, Integer overDays, Integer modelId, Integer userId) {
List<VMCalendarPriceCostDTO> overAmountList = CollUtil.newArrayList(); List<VMCalendarPriceCostDTO> overAmountList = CollUtil.newArrayList();
//根据延期的天数算出 对应的日期价格 //根据延期的天数算出 对应的日期价格
Date overStart = endDate; Date overStart = DateUtil.offsetDay(endDate, 1);
//DateUtil.offsetDay(endDate, 1); Date overEnd = DateUtil.offsetDay(overStart, overDays);
Date overEnd = DateUtil.offsetDay(endDate, overDays);
List<VehicleModelCalendarPriceDTO> overlist = vehicleFeign.findVehicleModelCalendarPriceByDate(overStart.getTime(), overEnd.getTime(), modelId, userId).getData(); List<VehicleModelCalendarPriceDTO> overlist = vehicleFeign.findVehicleModelCalendarPriceByDate(overStart.getTime(), overEnd.getTime(), modelId, userId).getData();
for(VehicleModelCalendarPriceDTO vmcpd : overlist) { for(VehicleModelCalendarPriceDTO vmcpd : overlist) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment