|
@@ -140,7 +140,8 @@ public class ParkingFeeCalculator {
|
|
|
return 0.0;
|
|
|
}
|
|
|
} else if (StringUtils.equals(couponRecord.couponType,"2")) {//时长券
|
|
|
- double dicFee = calculateRemainingFee(Duration.ofMinutes(new BigDecimal(couponRecord.denomination).intValue()), feeRule);
|
|
|
+ //用计算不足24小时的部分来计算,不区分首周期
|
|
|
+ double dicFee = calculateRemainingFeeDue(Duration.ofMinutes(new BigDecimal(couponRecord.denomination).intValue()), feeRule);
|
|
|
log.info("优惠金额: "+dicFee+"元");
|
|
|
return totalFee - dicFee;
|
|
|
}
|