From 99d8778bfe07d4249b5c89ab81ae56e51b92f15c Mon Sep 17 00:00:00 2001 From: Lincpay Tech Date: Fri, 28 Nov 2025 11:04:29 +0530 Subject: [PATCH] added userid in the entity payment inti and transactionmaster --- .../billpaymentservice/bbps/dto/request/BaseClass.java | 3 +++ .../billpaymentservice/bbps/entites/PaymentInitiate.java | 6 ++++++ .../bbps/entites/TransactionMaster.java | 8 +++++++- .../bbps/serviceImpl/PaymentServiceImpl.java | 7 +++++++ src/main/resources/application-local.properties | 4 ++-- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java b/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java index 5c41339..05948e3 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java +++ b/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java @@ -30,6 +30,9 @@ public abstract class BaseClass { @NotBlank(message = "Request ID cannot be null or blank") private String reqId; + @JsonProperty("userId") + private String clientUserId; + private DeviceDetail deviceDetial; // ✅ 10 User Defined Fields (UDF1–UDF10) private String udf1; diff --git a/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java b/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java index 61f92c8..b2e1a84 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java @@ -22,6 +22,12 @@ public class PaymentInitiate { @Column(name = "bank_txn_Id", nullable = false) private String bankTxnId; + + @Column(name = "client_user_id") + private String clientUserId; + + @Column(name = "mid") + private String mid; @Column(name = "txn_id") 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 da9f9ad..a484b75 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java @@ -35,6 +35,12 @@ public class TransactionMaster { // 👇 Apna internal transaction id, manually generate or system ke through @Column(name = "txn_id") private String txnId; + + @Column(name = "client_user_id") + private String clientUserId; + + @Column(name = "mid") + private String mid; @Column(name = "req_id") private String reqId; @@ -148,7 +154,7 @@ public class TransactionMaster { @Column(name = "plan_type") private String planType; - + @Column(name = "creation_date") private String creationDate; diff --git a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java index ef43309..9489f0a 100644 --- a/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java +++ b/src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java @@ -142,6 +142,8 @@ public class PaymentServiceImpl implements PaymentService { PaymentInitiate paymentInitiate = new PaymentInitiate(); paymentInitiate.setTxnId(txnId); paymentInitiate.setReqId(requestId); + paymentInitiate.setMid(billPaymentRequest.getMid()); + paymentInitiate.setClientUserId(billPaymentRequest.getClientUserId()); paymentInitiate.setBankTxnId(billPaymentResponse.getTxnId()); paymentInitiate.setStatus(billPaymentResponse.getStatus()); paymentIntiateRepository.save(paymentInitiate); @@ -150,6 +152,9 @@ public class PaymentServiceImpl implements PaymentService { TransactionStatusRequest transactionStatusRequest = new TransactionStatusRequest(); transactionStatusRequest.setTxnId(billPaymentResponse.getTxnId()); transactionStatusRequest.setReqId(requestId); + transactionStatusRequest.setMid(billPaymentRequest.getMid()); + transactionStatusRequest.setClientUserId(billPaymentRequest.getClientUserId()); + try { Thread.sleep((long) BBPSConstant.PAYMENT_STATUS_DELAY_MS); @@ -213,6 +218,8 @@ public class PaymentServiceImpl implements PaymentService { TransactionMaster transactionMaster = modelMapper.map(responseWrapper.getTransactionDAO(), TransactionMaster.class); transactionMaster.setTxnId(txnId); transactionMaster.setReqId(transactionStatusRequest.getReqId()); + transactionMaster.setMid(transactionStatusRequest.getMid()); + transactionMaster.setClientUserId(transactionStatusRequest.getClientUserId()); EntityRelationshipUtil.linkTransactionMasterRelationships(transactionMaster); transactionMasterRepository.save(transactionMaster); LOGGER.info("TransactionMaster saved successfully for txnId={}", txnId); diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index aaf1e10..4eaafbc 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -20,9 +20,9 @@ swagger.server.description=Local Development Server # DataSource spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS spring.datasource.username=postgres -spring.datasource.password=UAT@DB_2025 +#spring.datasource.password=UAT@DB_2025 -#spring.datasource.password=himanshu@123 +spring.datasource.password=himanshu@123 spring.datasource.driver-class-name=org.postgresql.Driver spring.datasource.type=com.zaxxer.hikari.HikariDataSource