Merge pull request #743 from egovernments/PFM-5564

Pfm 5564
egovernments · Mar 7, 2024 · fdd4ec9 · fdd4ec9
2 parents c930a71 + f046b45
commit fdd4ec9
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/...al-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java b/...al-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java
@@ -378,10 +378,20 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten
 				messageString = messageString.replace("{ownername}", owner.getName());
 				messageString = messageString.replace("{Period}", billCycle);
 				messageString = messageString.replace("{consumerno}", consumerCode);
-				messageString = messageString.replace("{billamount}", totalamount.toString());
+				BigDecimal demandAmount= demandDetails.stream()
+						.map(DemandDetail::getTaxAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal arrears=totalamount.subtract(demandAmount);
+				if(arrears.compareTo(BigDecimal.ZERO)>0)
+				{
+					messageString = messageString.replace("{billamount}", totalamount.toString()+"(includes Rs."+ arrears.toString()+ " arrears)");
+				}
+				else
+				{
+					messageString = messageString.replace("{billamount}", totalamount.toString());
+				}
 				messageString = messageString.replace("{BILL_LINK}", getShortenedUrl(actionLink));
 
-			//	System.out.println("Demand genaration Message get bill::" + messageString);
+//				System.out.println("Demand genaration Message get bill::" + messageString);
 
 				SMSRequest sms = SMSRequest.builder().mobileNumber(owner.getMobileNumber()).message(messageString).tenantid(tenantId)
 						.category(Category.TRANSACTION).build();