Merge branch 'holiday-price' into dev

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

@@ -207,17 +207,21 @@ public class OrderCalculateBiz {
             BigDecimal residueAmount = BigDecimal.ZERO;
             for(int i = useDays; i < vehicleItemDTO.getTotalNum(); i++) {
                 residueAmount = residueAmount.add(vmcpds.get(i).getPrice());
+                inProgressVO.getViolateAmountList().add(vmcpds.get(i));
             }
             String violateDesc = StrUtil.format("{}元", residueAmount.toString());
+
             if(residueDays >= 2) {
                 residueDays = 2;
                 residueAmount = BigDecimal.ZERO;
+                inProgressVO.setViolateAmountList(CollUtil.newArrayList());
                 for(int i = useDays; i < (useDays + residueDays); i++) {
                     residueAmount = residueAmount.add(vmcpds.get(i).getPrice());
                     inProgressVO.getViolateAmountList().add(vmcpds.get(i));
                 }
                 violateDesc += StrUtil.format("（封顶{}元）", residueAmount);
             }
+
             inProgressVO.setViolateAmount(residueAmount);
             inProgressVO.setViolateDesc(" 提前还车违约金："+ violateDesc);
             OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), violateDesc, DeductionTypeEnum.VIOLATE_ADVANCE, OrderAccountDeduction.ORIGIN_DEPOSIT);