Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/CancelStartedVO.java

@@ -93,7 +93,7 @@ public class CancelStartedVO extends CostDetailExtend {
         for(VMCalendarPriceCostDTO vmcpcd : useAmountList) {
             if(null == tempUnitPrice) {
                 tempUnitPrice = vmcpcd.getPrice();
-            }else if(tempUnitPrice.equals(vmcpcd.getPrice())) {
+            }else if(!tempUnitPrice.equals(vmcpcd.getPrice())) {
                 return 0;
             }
         }

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

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

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

@@ -234,11 +234,12 @@ 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);
                 inProgressVO.setViolateDesc(" 延期还车违约金："+ violateDesc);
+                inProgressVO.setOverAmountList(overAmountList);
                 OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), violateDesc, DeductionTypeEnum.VIOLATE_DELAY, OrderAccountDeduction.ORIGIN_DEPOSIT);
                 oad.getDeductions().add(violateDeduction);
             }