Merge branch 'holiday-price' into dev

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

@@ -55,9 +55,8 @@ public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
     public List<VMCalendarPriceCostDTO> getOverAmountList(Date endDate, Integer overDays, Integer modelId, Integer userId) {
         List<VMCalendarPriceCostDTO> overAmountList = CollUtil.newArrayList();
         //根据延期的天数算出 对应的日期价格
-        Date overStart = endDate;
-                //DateUtil.offsetDay(endDate, 1);
-        Date overEnd = DateUtil.offsetDay(endDate, overDays);
+        Date overStart = DateUtil.offsetDay(endDate, 1);
+        Date overEnd = DateUtil.offsetDay(overStart, overDays);
         List<VehicleModelCalendarPriceDTO> overlist = vehicleFeign.findVehicleModelCalendarPriceByDate(overStart.getTime(), overEnd.getTime(), modelId, userId).getData();
 
         for(VehicleModelCalendarPriceDTO vmcpd : overlist) {