user id addded in this code

This commit is contained in:
Mohd-Arham
2025-12-03 17:40:04 +05:30
parent d521459227
commit 003dd9325c
33 changed files with 723 additions and 568 deletions
@@ -35,4 +35,7 @@ public class AmountOptionDetails {
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -1,4 +1,5 @@
package com.billpaymentservice.bbps.entites;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@@ -13,14 +14,17 @@ import lombok.NoArgsConstructor;
@Entity
@Table(name = "bill_initiate")
public class BillInitiate {
@Id
@Column(name = "req_id")
private String reqId;
@Column(name = "bill_id", nullable = false)
private String billId;
@Column(name = "txn_id")
private String txnId;
@Id
@Column(name = "req_id")
private String reqId;
@Column(name = "bill_id", nullable = false)
private String billId;
@Column(name = "txn_id")
private String txnId;
@Column(name = "client_user_id")
private String clientUserId;
}
@@ -1,7 +1,9 @@
package com.billpaymentservice.bbps.entites;
import java.util.List;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
@@ -23,27 +25,28 @@ import lombok.Setter;
@NoArgsConstructor
public class BillMaster {
@Id
private String billId; // primary key
@Id
private String billId; // primary key
private String reqId; // client se aaya hua
private String txnId; // system-generated
private String refId;
private String billerId;
private String status;
private String actionType;
private String userId;
@OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "biller_response_id")
private BillerResponse billerResponse;
@OneToMany(mappedBy = "billMaster", cascade = CascadeType.ALL)
private List<AdditionalInfoBill> additionalInfo;
@OneToMany(mappedBy = "billMaster", cascade = CascadeType.ALL)
private List<CustomerParamBill> customerParams;
private String creationDate;
private String modifiedDate;
private Long createdEpochDate;
private Long modifiedEpochDate;
private String reqId; // client se aaya hua
private String txnId; // system-generated
private String refId;
private String billerId;
private String status;
private String actionType;
private String clientUserId;
private String userId;
@OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "biller_response_id")
private BillerResponse billerResponse;
@OneToMany(mappedBy = "billMaster", cascade = CascadeType.ALL)
private List<AdditionalInfoBill> additionalInfo;
@OneToMany(mappedBy = "billMaster", cascade = CascadeType.ALL)
private List<CustomerParamBill> customerParams;
private String creationDate;
private String modifiedDate;
private Long createdEpochDate;
private Long modifiedEpochDate;
// getters and setters
// getters and setters
}
@@ -1,6 +1,5 @@
package com.billpaymentservice.bbps.entites;
import java.util.List;
import jakarta.persistence.*;
@@ -15,47 +14,56 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class BillValidation {
@Id
@Column(name = "bill_id", nullable = false, length = 100)
private String billId;
@Id
@Column(name = "bill_id", nullable = false, length = 100)
private String billId;
@Column(name = "ref_id", length = 100)
private String refId;
@Column(name = "ref_id", length = 100)
private String refId;
@Column(name = "biller_id", length = 100)
private String billerId;
@Column(name = "biller_id", length = 100)
private String billerId;
@Column(name = "status", length = 100)
private String status;
@Column(name = "status", length = 100)
private String status;
@Column(name = "action_type", length = 100)
private String actionType;
@Column(name = "action_type", length = 100)
private String actionType;
@Column(name = "user_id", length = 100)
private String userId;
@Column(name = "user_id", length = 100)
private String userId;
@Column(name = "biller_response", columnDefinition = "TEXT")
private String billerResponse;
@Column(name = "biller_response", columnDefinition = "TEXT")
private String billerResponse;
@OneToMany(mappedBy = "bill", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<AdditionalInfoBillValidate> additionalInfo;
@OneToMany(mappedBy = "bill", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<AdditionalInfoBillValidate> additionalInfo;
// 👇 Proper nested customer params (OneToMany)
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bill")
private List<CustomerParamBillValidation> customerParams;
// 👇 Proper nested customer params (OneToMany)
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bill")
private List<CustomerParamBillValidation> customerParams;
@Column(name = "plan_info_daos", columnDefinition = "TEXT")
private String planInfoDaos;
@Column(name = "plan_info_daos", columnDefinition = "TEXT")
private String planInfoDaos;
@Column(name = "creation_date", length = 50)
private String creationDate;
@Column(name = "creation_date", length = 50)
private String creationDate;
@Column(name = "modified_date", length = 50)
private String modifiedDate;
@Column(name = "modified_date", length = 50)
private String modifiedDate;
@Column(name = "created_epoch_date", length = 50)
private String createdEpochDate;
@Column(name = "created_epoch_date", length = 50)
private String createdEpochDate;
@Column(name = "modified_epoch_date", length = 50)
private String modifiedEpochDate;
@Column(name = "modified_epoch_date", length = 50)
private String modifiedEpochDate;
@Column(name = "txn_id")
private String txnId;
@Column(name = "req_id")
private String reqId;
@Column(name = "client_user_id")
private String clientUserId;
}
@@ -30,4 +30,7 @@ public class CategoryResponseList extends Auditable<String> {
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -68,4 +68,7 @@ public class ComplainStatus extends Auditable<String> {
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -23,25 +23,27 @@ public class ComplaintHistory extends Auditable<String> {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private Long id;
@Column(name="history_id")
@Column(name = "history_id")
private String historyId;
@Column(name="ticket_id")
@Column(name = "ticket_id")
private String ticketId;
@Column(name="time")
@Column(name = "time")
private String time;
@Column(name="history_status")
@Column(name = "history_status")
private String historyStatus;
@Column(name = "txn_id")
private String txnId;
@Column(name = "req_id")
private String reqId;
@Column(name = "user_id")
private String userId;
}
@@ -10,10 +10,12 @@ import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Entity
@Getter
@Setter
@ToString
@Table(name = "complaint_responses")
public class ComplaintResponseEntity extends Auditable<String> {
@@ -15,18 +15,21 @@ import lombok.Setter;
@Getter
@Setter
@Table(name = "view_ticket_status")
public class ComplaintStatusDetails extends Auditable<String>{
public class ComplaintStatusDetails extends Auditable<String> {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "req_id")
private String reqId;
@Column(name = "txn_id")
private String systemTxnId;
@Column(name = "user_id")
private String userId;
@Column(name = "total_elements")
private String totalElements;
@@ -56,4 +56,6 @@ public class CustomerParamGroupById extends Auditable<String> {
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -15,13 +15,22 @@ import lombok.ToString;
@ToString
public class DispositionDetails {
@Id
@Column(name = "disposition_id", nullable = false, unique = true)
private String dispositionId; // UUID type string
@Id
@Column(name = "disposition_id", nullable = false, unique = true)
private String dispositionId; // UUID type string
@Column(name = "disposition_descr", nullable = false)
private String dispositionDescr;
@Column(name = "disposition_descr", nullable = false)
private String dispositionDescr;
@Column(name = "tenant_id")
private String tenantId;
@Column(name = "tenant_id")
private String tenantId;
@Column(name = "req_id")
private String reqId;
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -8,7 +8,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -16,22 +15,25 @@ import lombok.NoArgsConstructor;
@Table(name = "payment_initiate")
public class PaymentInitiate {
@Id
@Column(name = "req_id")
private String reqId;
@Id
@Column(name = "req_id")
private String reqId;
@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 = "bank_txn_Id", nullable = false)
private String bankTxnId;
@Column(name = "txn_id")
private String txnId;
@Column(name = "client_user_id")
private String clientUserId;
@Column(name = "status")
private String status;
@Column(name = "mid")
private String mid;
@Column(name = "txn_id")
private String txnId;
@Column(name = "status")
private String status;
@Column(name = "user_id")
private String userId;
}
@@ -47,4 +47,7 @@ public class PlanResponses extends Auditable<String> {
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -41,4 +41,6 @@ public class TicketDispositionDetails extends Auditable<String> {
@Column(name = "txn_id")
private String txnId;
@Column(name = "user_id")
private String userId;
}
@@ -27,6 +27,9 @@ public class ViewAllComplaintTicketStatusDetails extends Auditable<String> {
@Column(name = "txn_id")
private String systemTxnId;
@Column(name = "user_id")
private String userId;
@Column(name = "total_elements")
private String totalElements;