Merge branch 'holiday-price' into dev

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

@@ -55,7 +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 = DateUtil.offsetDay(endDate, 1);
+        Date overStart = endDate;
+                //DateUtil.offsetDay(endDate, 1);
         Date overEnd = DateUtil.offsetDay(endDate, overDays);
         List<VehicleModelCalendarPriceDTO> overlist = vehicleFeign.findVehicleModelCalendarPriceByDate(overStart.getTime(), overEnd.getTime(), modelId, userId).getData();
 

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

@@ -234,7 +234,7 @@ public class OrderCalculateBiz {
 
                 List<VMCalendarPriceCostDTO> overAmountList = orderItemBiz.getOverAmountList(vmcpds.get(vmcpds.size() - 1).getDate(), overDays, vehicleItemDTO.getGoodId(), baseOrder.getUserId());
                 BigDecimal overAmount = overAmountList.parallelStream()
-                        .map(VMCalendarPriceCostDTO::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add).add(new BigDecimal(2+ ""));
+                        .map(VMCalendarPriceCostDTO::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(new BigDecimal(2+ ""));
 
                 //超过的天数 价格 * 200%
                 inProgressVO.setViolateAmount(overAmount);