WOR-394 Advance Payment hot fix (#65)

WOR-394 correction to advance tax amount in case of multiple updates WOR-394 Error map is thrown as Custom Exception in validate
egovernments · Jul 28, 2020 · 105b49c · 105b49c
1 parent afb3913
commit 105b49c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/billing-service/src/main/java/org/egov/demand/service/ReceiptServiceV2.java b/billing-service/src/main/java/org/egov/demand/service/ReceiptServiceV2.java
@@ -175,7 +175,7 @@ private void updateSingleDemandDetail(DemandDetail currentDetail, BillAccountDet
 		BigDecimal newAmount = billAccDetail.getAdjustedAmount();
 
 		if(advanceTaxHead!=null && billAccDetail.getTaxHeadCode().equalsIgnoreCase(advanceTaxHead))
-			currentDetail.setTaxAmount(billAccDetail.getAmount());
+			currentDetail.setTaxAmount(billAccDetail.getAmount().add(oldCollectedAmount));
 
 		if (isRecieptCancellation)
 			currentDetail.setCollectionAmount(oldCollectedAmount.subtract(newAmount));

diff --git a/billing-service/src/main/java/org/egov/demand/web/validator/DemandValidatorV1.java b/billing-service/src/main/java/org/egov/demand/web/validator/DemandValidatorV1.java
@@ -485,6 +485,9 @@ public void validateForUpdate(DemandRequest demandRequest, DocumentContext mdmsD
 		olddemandDetails.addAll(newDemandDetails);
 		validateDemandDetails(olddemandDetails, errorMap);
 
+		if(!errorMap.isEmpty())
+			throw new CustomException(errorMap);
+
 		/*
 		 * validate demand for Create is called to validate the new demand details which is part of update
 		 *