修改提前还车逻辑

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

@@ -312,6 +312,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 //提前的天数, 当天就算使用一天
                 int noUsedDay = getDaysBetweenDateTime(nowTime, endTime) - 1;
                 //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
+                BigDecimal cost = new BigDecimal(0);
                 InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, actualDay - noUsedDay);
                 if (inProgressVO != null) {
                     baseOrder.setViolateAmount(inProgressVO.getViolateAmount());
@@ -321,9 +322,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                         inProgressVO.getBackCoupons().forEach((a) -> backCoupons.append(a + ","));
                         baseOrder.setBackCoupon(backCoupons.toString());
                     }
+                    cost.add(inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
                 }
-                BigDecimal cost = new BigDecimal(0);
-                cost.add(inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
+
                 updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.BEFORE.getCode());
                 //延期还车,结束时间小于当前时间
             } else if (orderRentVehicleDetail.getEndTime() < nowTime.getMillis()) {