update Code
This commit is contained in:
@@ -30,6 +30,9 @@ public abstract class BaseClass {
|
|||||||
@NotBlank(message = "Request ID cannot be null or blank")
|
@NotBlank(message = "Request ID cannot be null or blank")
|
||||||
private String reqId;
|
private String reqId;
|
||||||
|
|
||||||
|
@JsonProperty("userId")
|
||||||
|
private String clientUserId;
|
||||||
|
|
||||||
private DeviceDetail deviceDetial;
|
private DeviceDetail deviceDetial;
|
||||||
// ✅ 10 User Defined Fields (UDF1–UDF10)
|
// ✅ 10 User Defined Fields (UDF1–UDF10)
|
||||||
private String udf1;
|
private String udf1;
|
||||||
|
|||||||
@@ -22,6 +22,12 @@ public class PaymentInitiate {
|
|||||||
|
|
||||||
@Column(name = "bank_txn_Id", nullable = false)
|
@Column(name = "bank_txn_Id", nullable = false)
|
||||||
private String bankTxnId;
|
private String bankTxnId;
|
||||||
|
|
||||||
|
@Column(name = "client_user_id")
|
||||||
|
private String clientUserId;
|
||||||
|
|
||||||
|
@Column(name = "mid")
|
||||||
|
private String mid;
|
||||||
|
|
||||||
@Column(name = "txn_id")
|
@Column(name = "txn_id")
|
||||||
private String txnId;
|
private String txnId;
|
||||||
|
|||||||
@@ -35,6 +35,12 @@ public class TransactionMaster {
|
|||||||
// 👇 Apna internal transaction id, manually generate or system ke through
|
// 👇 Apna internal transaction id, manually generate or system ke through
|
||||||
@Column(name = "txn_id")
|
@Column(name = "txn_id")
|
||||||
private String txnId;
|
private String txnId;
|
||||||
|
|
||||||
|
@Column(name = "client_user_id")
|
||||||
|
private String clientUserId;
|
||||||
|
|
||||||
|
@Column(name = "mid")
|
||||||
|
private String mid;
|
||||||
|
|
||||||
@Column(name = "req_id")
|
@Column(name = "req_id")
|
||||||
private String reqId;
|
private String reqId;
|
||||||
@@ -148,7 +154,7 @@ public class TransactionMaster {
|
|||||||
|
|
||||||
@Column(name = "plan_type")
|
@Column(name = "plan_type")
|
||||||
private String planType;
|
private String planType;
|
||||||
|
|
||||||
@Column(name = "creation_date")
|
@Column(name = "creation_date")
|
||||||
private String creationDate;
|
private String creationDate;
|
||||||
|
|
||||||
|
|||||||
@@ -142,6 +142,8 @@ public class PaymentServiceImpl implements PaymentService {
|
|||||||
PaymentInitiate paymentInitiate = new PaymentInitiate();
|
PaymentInitiate paymentInitiate = new PaymentInitiate();
|
||||||
paymentInitiate.setTxnId(txnId);
|
paymentInitiate.setTxnId(txnId);
|
||||||
paymentInitiate.setReqId(requestId);
|
paymentInitiate.setReqId(requestId);
|
||||||
|
paymentInitiate.setMid(billPaymentRequest.getMid());
|
||||||
|
paymentInitiate.setClientUserId(billPaymentRequest.getClientUserId());
|
||||||
paymentInitiate.setBankTxnId(billPaymentResponse.getTxnId());
|
paymentInitiate.setBankTxnId(billPaymentResponse.getTxnId());
|
||||||
paymentInitiate.setStatus(billPaymentResponse.getStatus());
|
paymentInitiate.setStatus(billPaymentResponse.getStatus());
|
||||||
paymentIntiateRepository.save(paymentInitiate);
|
paymentIntiateRepository.save(paymentInitiate);
|
||||||
@@ -150,6 +152,9 @@ public class PaymentServiceImpl implements PaymentService {
|
|||||||
TransactionStatusRequest transactionStatusRequest = new TransactionStatusRequest();
|
TransactionStatusRequest transactionStatusRequest = new TransactionStatusRequest();
|
||||||
transactionStatusRequest.setTxnId(billPaymentResponse.getTxnId());
|
transactionStatusRequest.setTxnId(billPaymentResponse.getTxnId());
|
||||||
transactionStatusRequest.setReqId(requestId);
|
transactionStatusRequest.setReqId(requestId);
|
||||||
|
transactionStatusRequest.setMid(billPaymentRequest.getMid());
|
||||||
|
transactionStatusRequest.setClientUserId(billPaymentRequest.getClientUserId());
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Thread.sleep((long) BBPSConstant.PAYMENT_STATUS_DELAY_MS);
|
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 transactionMaster = modelMapper.map(responseWrapper.getTransactionDAO(), TransactionMaster.class);
|
||||||
transactionMaster.setTxnId(txnId);
|
transactionMaster.setTxnId(txnId);
|
||||||
transactionMaster.setReqId(transactionStatusRequest.getReqId());
|
transactionMaster.setReqId(transactionStatusRequest.getReqId());
|
||||||
|
transactionMaster.setMid(transactionStatusRequest.getMid());
|
||||||
|
transactionMaster.setClientUserId(transactionStatusRequest.getClientUserId());
|
||||||
EntityRelationshipUtil.linkTransactionMasterRelationships(transactionMaster);
|
EntityRelationshipUtil.linkTransactionMasterRelationships(transactionMaster);
|
||||||
transactionMasterRepository.save(transactionMaster);
|
transactionMasterRepository.save(transactionMaster);
|
||||||
LOGGER.info("TransactionMaster saved successfully for txnId={}", txnId);
|
LOGGER.info("TransactionMaster saved successfully for txnId={}", txnId);
|
||||||
|
|||||||
@@ -20,9 +20,9 @@ swagger.server.description=Local Development Server
|
|||||||
# DataSource
|
# DataSource
|
||||||
spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
|
spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
|
||||||
spring.datasource.username=postgres
|
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.driver-class-name=org.postgresql.Driver
|
||||||
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user