From 19f069132bc1713ecdfc2fdc6a994c3f3605a869 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 15:00:19 +0530 Subject: [PATCH] PFM-5564 --- .../java/org/egov/wscalculation/service/DemandService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java index 852d2b6c7..e4a03511b 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java @@ -304,7 +304,7 @@ private List createDemand(RequestInfo requestInfo, List cal } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); //log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); - if(totalAmount.signum()> 0 && totalAmount!=null) + if(totalAmount!=null && totalAmount.signum()> 0) sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } @@ -373,7 +373,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten log.info("Demand Object get bill" + demands.toString()); log.info("requestInfo get Bill" + requestInfo); log.info("bill number get bill size :" + billNumbers.size()); - if (billNumbers.size() > 0 && totalamount.signum()>0 && totalamount!=null) { + if (totalamount!=null && billNumbers.size() > 0 && totalamount.signum()>0) { actionLink = actionLink.replace("$billNumber", billNumbers.get(0)); messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle);