From 0e747ed2a7d503862ce4c1bb02a28bd448edbc20 Mon Sep 17 00:00:00 2001 From: Lincpay Tech Date: Tue, 16 Dec 2025 16:50:48 +0530 Subject: [PATCH] updated entity and removed mid from paymentstartRecord --- .../bbps/controller/PaymentController.java | 1 - .../bbps/dto/TransactionDTO.java | 13 ++++--- .../bbps/entites/PaymentStartRecord.java | 3 -- .../bbps/entites/TransactionMaster.java | 16 ++++---- .../bbps/serviceImpl/ComplainServiceImpl.java | 2 +- .../bbps/util/BillerMapperHelper.java | 38 +++++++++---------- 6 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/controller/PaymentController.java b/src/main/java/com/billpaymentservice/bbps/controller/PaymentController.java index 4bcbd62..b2a9a2f 100644 --- a/src/main/java/com/billpaymentservice/bbps/controller/PaymentController.java +++ b/src/main/java/com/billpaymentservice/bbps/controller/PaymentController.java @@ -46,7 +46,6 @@ public class PaymentController { @ApiDocCommonResponses public ResponseEntity requestBillFetch( @RequestBody BillPaymentRequest billPaymentRequest) { - ResponseModel response = paymentService.initiatePayment(billPaymentRequest); return ResponseEntity.ok(response); } diff --git a/src/main/java/com/billpaymentservice/bbps/dto/TransactionDTO.java b/src/main/java/com/billpaymentservice/bbps/dto/TransactionDTO.java index d6bd669..0b3db0c 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/TransactionDTO.java +++ b/src/main/java/com/billpaymentservice/bbps/dto/TransactionDTO.java @@ -66,9 +66,12 @@ public class TransactionDTO { private String planType; // ✅ Date fields as String (for JSON compatibility) - private String creationDate; - private String modifiedDate; - - private Long createdEpochDate; - private Long modifiedEpochDate; + @JsonProperty("creationDate") + private String creationDateBank; + @JsonProperty("modifiedDate") + private String modifiedDateBank; + @JsonProperty("createdEpochDate") + private Long createdEpochDateBank; + @JsonProperty("modifiedEpochDate") + private Long modifiedEpochDateBank; } diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java b/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java index 3f45dba..a809a87 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/PaymentStartRecord.java @@ -47,9 +47,6 @@ public class PaymentStartRecord extends Auditable { @Column(name = "amount", nullable = false) private String amount; - @Column(name = "mid", nullable = false) - private String mid; - @Column(name = "txn_id", unique = true, nullable = false) private String txnId; diff --git a/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java b/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java index 3033829..d563f8d 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java @@ -164,15 +164,15 @@ public class TransactionMaster extends Auditable { @Column(name = "plan_type") private String planType; - @Column(name = "creation_date") - private String creationDate; + @Column(name = "creation_date_bank") + private String creationDateBank; - @Column(name = "modified_date") - private String modifiedDate; + @Column(name = "modified_date_bank") + private String modifiedDateBank; - @Column(name = "created_epoch_date") - private Long createdEpochDate; + @Column(name = "created_epoch_date_bank") + private Long createdEpochDateBank; - @Column(name = "modified_epoch_date") - private Long modifiedEpochDate; + @Column(name = "modified_epoch_date_bank") + private Long modifiedEpochDateBank; } \ No newline at end of file diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/ComplainServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/ComplainServiceImpl.java index 16b78fc..b5d1926 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/ComplainServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/ComplainServiceImpl.java @@ -134,7 +134,7 @@ public class ComplainServiceImpl implements ComplainService { TransactionMaster transData = dataById.get(); // Inject tenantId + agentId into request JSON - String transactionCreatedDateString = transData.getCreationDate(); + String transactionCreatedDateString = transData.getCreationDateBank(); LOGGER.info("Date is coming -:" + transactionCreatedDateString); LOGGER.info("Return Date Time After 24 Hours" + BillerMapperHelper.isComplaintAllowed(transactionCreatedDateString)); diff --git a/src/main/java/com/billpaymentservice/bbps/util/BillerMapperHelper.java b/src/main/java/com/billpaymentservice/bbps/util/BillerMapperHelper.java index c889a2a..04d1af6 100644 --- a/src/main/java/com/billpaymentservice/bbps/util/BillerMapperHelper.java +++ b/src/main/java/com/billpaymentservice/bbps/util/BillerMapperHelper.java @@ -1037,9 +1037,9 @@ public class BillerMapperHelper { dto.setPaymentInformation(transactionMaster.getPaymentInformation()); dto.setPlanId(transactionMaster.getPlanId()); dto.setPlanType(transactionMaster.getPlanType()); - dto.setCreationDate(transactionMaster.getCreationDate()); - dto.setModifiedDate(transactionMaster.getModifiedDate()); - dto.setCreatedEpochDate(transactionMaster.getCreatedEpochDate()); + dto.setCreationDate(transactionMaster.getCreationDateBank()); + dto.setModifiedDate(transactionMaster.getModifiedDateBank()); + dto.setCreatedEpochDate(transactionMaster.getCreatedEpochDateBank()); dto.setModifiedEpochDate(transactionMaster.getModifiedEpochDate()); return dto; } @@ -1052,7 +1052,7 @@ public class BillerMapperHelper { TransactionHistoryParticularDetailsDTO dto = new TransactionHistoryParticularDetailsDTO(); dto.setBankTxnId(transactionMaster.getBankTxnId()); dto.setTxnId(transactionMaster.getTxnId()); - dto.setCreationDate(transactionMaster.getCreationDate()); + dto.setCreationDate(transactionMaster.getCreationDateBank()); dto.setBillerCategory(transactionMaster.getBillerCategory()); dto.setBillerName(transactionMaster.getBillerName()); dto.setStatus(transactionMaster.getStatus()); @@ -1095,21 +1095,21 @@ public class BillerMapperHelper { record.setClientUserId(request.getClientUserId()); record.setInternalTxnId(txnId); - if (apiResponse != null && apiResponse.getResponseData() != null) { - record.setAmount(Optional.ofNullable(apiResponse.getResponseData().getAmount()).orElse("0.00")); - record.setMid(Optional.ofNullable(apiResponse.getResponseData().getMid()).orElse("DUMMY_MID")); - record.setTxnId(Optional.ofNullable(apiResponse.getResponseData().getTxnId()).orElse("DUMMY_TXN")); - record.setQrString(Optional.ofNullable(apiResponse.getResponseData().getQrString()).orElse("NO_QR")); - // parse createdOn string into LocalDateTime and set on Auditable - LocalDateTime createdOn = parseToLocalDateTime(apiResponse.getResponseData().getCreatedOn()); - - record.setTxnStatus("PENDING"); - } else { - record.setAmount("0.00"); - record.setMid(request.getMid()); - record.setTxnStatus("PENDING"); - } - + if (apiResponse != null && + apiResponse.getResponseData() != null) { + record.setAmount(Optional.ofNullable(apiResponse.getResponseData().getAmount( + )).orElse("0.00")); + + record.setTxnId(Optional.ofNullable(apiResponse.getResponseData().getTxnId()) + .orElse("DUMMY_TXN")); + record.setQrString(Optional.ofNullable(apiResponse.getResponseData(). + getQrString()).orElse("NO_QR")); // parse createdOn string into LocalDateTime and set on Auditable + LocalDateTime createdOn =parseToLocalDateTime(apiResponse.getResponseData().getCreatedOn()); + + record.setTxnStatus("PENDING"); } else { record.setAmount("0.00"); + record.setTxnStatus("PENDING"); } + + // store the original request body and raw response record.setRequestBody(requestJson); record.setResponseBody(rawResponse);