collection migration fix RAIN-1618 (#112)

egovernments · Oct 8, 2020 · 0f3a563 · 0f3a563
1 parent a631214
commit 0f3a563
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/collection-services/src/main/java/org/egov/collection/service/MigrationService.java b/collection-services/src/main/java/org/egov/collection/service/MigrationService.java
@@ -305,8 +305,13 @@ private Payment getPayment(RequestInfo requestInfo, Receipt_v1 receipt, Bill new
 
 			payment.setPaymentStatus(PaymentStatusEnum.CANCELLED);
 			payment.setInstrumentStatus(InstrumentStatusEnum.CANCELLED);
+			Bill bill = payment.getPaymentDetails().get(0).getBill();
+			bill.setStatus(Bill.StatusEnum.CANCELLED);
+            bill.setIsCancelled(true);
+
 		} else {
 
+			payment.setInstrumentStatus(InstrumentStatusEnum.APPROVED);
 			if ((payment.getPaymentMode().toString()).equalsIgnoreCase(ONLINE.name())
 					|| payment.getPaymentMode().toString().equalsIgnoreCase(CARD.name())
 					|| (receiptHeaderStatus.equalsIgnoreCase(ReceiptStatus.REMITTED.toString()))) {