Merge branch 'feature-delay-add' into dev

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

@@ -245,7 +245,7 @@ public class OrderCalculateBiz {
 
         //计算违约金
             //residueDays * 身份价格
-        if(realResidueDays > 0) {
+        if(realResidueDays > 0) { //提前还车
 
             //设置消耗费用列表
             for(int i = 0; i < useDays; i++) {
@@ -275,6 +275,9 @@ public class OrderCalculateBiz {
             inProgressVO.setViolateDesc(" 提前还车违约金："+ violateDesc);
             OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), violateDesc, DeductionTypeEnum.VIOLATE_ADVANCE, OrderAccountDeduction.ORIGIN_DEPOSIT);
             oad.getDeductions().add(violateDeduction);
+        }else if (realResidueDays.equals(0)) { //准时还车
+            //设置消耗费用列表
+            useAmountList.addAll(Convert.toList(VMCalendarPriceCostDTO.class, realVmcpds));
         }else if(realResidueDays < 0 && !isCancel){
             //isCancel 表示是否为取消，取消则不计算延期还车（因为没有出车）
             //设置消耗费用列表