FINERACT-2015: Fix saving account with withdrawal fee

This commit is contained in:
Vladyslav Samchenko
2026-02-11 12:01:03 +01:00
committed by Adam Saghy
parent 7faaf96246
commit 840f95c88f
3 changed files with 196 additions and 2 deletions
@@ -1346,11 +1346,13 @@ public class SavingsAccount extends AbstractAuditableWithUTCDateTimeCustom<Long>
if (charge.isEnablePaymentType() && charge.isEnableFreeWithdrawal()) { // discount transaction to
// specific paymentType
if (paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
if (paymentDetail != null && paymentDetail.getPaymentType() != null
&& paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
resetFreeChargeDaysCount(charge, transactionAmount, transactionDate, refNo);
}
} else if (charge.isEnablePaymentType()) { // normal charge-transaction to specific paymentType
if (paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
if (paymentDetail != null && paymentDetail.getPaymentType() != null
&& paymentDetail.getPaymentType().getName().equals(charge.getCharge().getPaymentType().getName())) {
charge.updateWithdralFeeAmount(transactionAmount);
this.payCharge(charge, charge.getAmountOutstanding(this.getCurrency()), transactionDate, backdatedTxnsAllowedTill,
refNo);