CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

Merge pull request #1268 from bharathc27/test1

Browse Source 
guaranterdomainserviceissue
This commit is contained in:
Vishwas Babu A J
2015-02-10 02:37:49 -08:00
parent 8b2843cabd ad3a77d70c
commit 1e4b4911e0
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/service/GuarantorDomainServiceImpl.java
+13 -11
View File
@@ -378,21 +378,23 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
BigDecimal amountForRelease = loanTransaction.getPrincipalPortion(); BigDecimal amountForRelease = loanTransaction.getPrincipalPortion();
BigDecimal totalGuaranteeAmount = loan.getGuaranteeAmount(); BigDecimal totalGuaranteeAmount = loan.getGuaranteeAmount();
BigDecimal principal = loan.getPrincpal().getAmount(); BigDecimal principal = loan.getPrincpal().getAmount();
if((amountForRelease!=null)&&(totalGuaranteeAmount!=null))
{
amountForRelease = amountForRelease.multiply(totalGuaranteeAmount).divide(principal,this.roundingMode);
List<DepositAccountOnHoldTransaction> accountOnHoldTransactions = new ArrayList<>();
amountForRelease = amountForRelease.multiply(totalGuaranteeAmount).divide(principal); BigDecimal amountLeft = calculateAndRelaseGuarantorFunds(externalGuarantorList, guarantorGuarantee, amountForRelease,
List<DepositAccountOnHoldTransaction> accountOnHoldTransactions = new ArrayList<>();
BigDecimal amountLeft = calculateAndRelaseGuarantorFunds(externalGuarantorList, guarantorGuarantee, amountForRelease,
loanTransaction, accountOnHoldTransactions); loanTransaction, accountOnHoldTransactions);
if (amountLeft.compareTo(BigDecimal.ZERO) == 1) { if (amountLeft.compareTo(BigDecimal.ZERO) == 1) {
calculateAndRelaseGuarantorFunds(selfGuarantorList, selfGuarantee, amountLeft, loanTransaction, accountOnHoldTransactions); calculateAndRelaseGuarantorFunds(selfGuarantorList, selfGuarantee, amountLeft, loanTransaction, accountOnHoldTransactions);
externalGuarantorList.addAll(selfGuarantorList); externalGuarantorList.addAll(selfGuarantorList);
} }
if (!externalGuarantorList.isEmpty()) { if (!externalGuarantorList.isEmpty()) {
this.depositAccountOnHoldTransactionRepository.save(accountOnHoldTransactions); this.depositAccountOnHoldTransactionRepository.save(accountOnHoldTransactions);
this.guarantorFundingRepository.save(externalGuarantorList); this.guarantorFundingRepository.save(externalGuarantorList);
}
} }
} }