Merge branch 'holiday-price' 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/inner/OrderCalculateBiz.java

@@ -239,6 +239,7 @@ public class OrderCalculateBiz {
                 //超过的天数 价格 * 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);
             }