resolved the conflicts

2025-12-22 18:10:12 +05:30
parent 5d0f043848 a4842788c1
commit 6126bc1d81
11 changed files with 84 additions and 61 deletions
@@ -402,7 +402,7 @@ public class PaymentStartServiceImpl implements PaymentStartService {

         record.setSignature(signature);
         record.setTxnStatus(txnStatus);
-         record.setCallbackReceivedOn(java.time.LocalDateTime.now().toString());
+         record.setCallbackReceivedOn(LocalDateTime.now().toString());

         String merchantStatus;
         if (!signatureMatches) {