feat(fd): dashboard-driven maturity renewal, plus fix stranded interest on Reinvest Principal Only

A SINGLE/DOUBLE FD opened with an explicit maturity instruction still auto-processes on its own via the nightly job, exactly as before -- the grace period never delays that. An FD opened with NO instruction at all (the new default -- see the frontend's account-creation changes) is now never touched by the job; it just sits matured until staff renew it manually from the FD Dashboard, backdated to the original maturity date within the product's grace window, or from today with gap-period interest (at the linked account's rate) credited first once it's passed. New endpoints: - POST /fixeddepositaccounts/{id}/renew -- the Dashboard's own quick Reinvest choice (Principal+Interest / Principal Only), for the two-option case. - POST /fixeddepositaccounts/{id}/credit-gap-interest -- a pre-step the frontend's Payment dialog now calls before submitting the existing generic `payment` command, so the Dashboard's Renew action offers every closure type Payment does (Transfer to Savings, both Reinvest options, Partial Reinvest), not just two, while still crediting gap-period interest first. Also fixes a real, pre-existing bug found while building this: REINVEST_PRINCIPAL_ONLY never actually paid its leftover interest anywhere -- handleFDAccountMaturityClosure withdrew only the principal into the new deposit and never referenced its own toSavingsId parameter, silently stranding the interest on an account it also never closed. Now transfers the remainder to the target savings account and actually closes the old account. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-24 15:55:25 +05:30
parent ecfe8aa76a
commit d2e13cc7b9
8 changed files with 415 additions and 2 deletions
@@ -92,5 +92,27 @@ public interface DepositAccountWritePlatformService {

    void updateMaturityDetails(Long depositAccountId, DepositAccountType depositAccountType);

+    /**
+     * Manually renews a matured FD from the FD Dashboard -- backdated to the original maturity date if
+     * still within the product's renewal grace window (0 days if none is configured), or from today
+     * with a gap-period interest credit (at the linked Savings account's product rate) if not.
+     * {@code reinvestType} is the staff's choice made at renewal time (300 = Reinvest Principal and
+     * Interest, 400 = Reinvest Principal Only -- the rest of the balance is paid to the FD's linked
+     * Savings account); the account's own stored maturity instruction, if any, is not consulted.
+     * Returns a small result map: renewedAccountId, maturityDate, maturityAmount, backdated (boolean),
+     * gapInterestAmount (BigDecimal, present only when backdated is false).
+     */
+    Map<String, Object> renewMaturedFixedDeposit(Long fdAccountId, Integer reinvestType);
+
+    /**
+     * Credits gap-period interest (simple interest, at the linked Savings/Current account's product
+     * rate) onto a matured FD if its product's renewal grace window has passed -- a no-op, returning
+     * zero, if still within it. Called as a pre-step before the FD Dashboard's Renew action submits the
+     * generic `payment` command (the same one the account's own Account Actions menu uses), so every
+     * closure type is available from the Dashboard, not just the two {@link #renewMaturedFixedDeposit}
+     * itself supports. Returns {@code withinGrace} (boolean) and {@code gapInterestAmount} (BigDecimal).
+     */
+    Map<String, Object> creditGapInterestIfPastGrace(Long fdAccountId);
+
    SavingsAccountTransaction mandatorySavingsAccountDeposit(SavingsAccountTransactionDTO accountTransactionDTO);
 }