10-11-25 after conflict

src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfo.java

@@ -1,8 +1,15 @@
 package com.billpaymentservice.bbps.entites;
 
 
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

src/main/java/com/billpaymentservice/bbps/entites/AdditionalInfoBill.java

@@ -0,0 +1,30 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+
+
+@Entity
+@Table(name = "additional_info_bill")
+@Getter
+@Setter
+public class AdditionalInfoBill {
+	@Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+    private String value;
+
+    @ManyToOne
+    @JoinColumn(name = "bill_master_id")
+    private BillMaster billMaster;
+
+}

src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransfer.java

@@ -0,0 +1,56 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "agent_fund_transfer_Txn_Status")
+@NoArgsConstructor
+@Getter
+@Setter
+@AllArgsConstructor
+public class AgentFundTransfer {
+	
+
+    @Id
+    @Column(name = "fund_txn_reference_id")
+    private String fundTxnReferenceId;  
+     
+    @Column(name = "transaction_master_id")
+    private String TransactionMasterId; //primary key from transaction master
+    
+    @Column(name = "txn_id")
+    private String txnId;
+    @Column(name = "req_id")
+    private String reqId;
+    @Column(name = "fund_txn_remarks")
+    private String fundTxnRemarks;      
+
+    @Column(name = "fund_txn_date")
+    private String fundTxnDate;          
+
+    @Column(name = "fund_txn_amt")
+    private Double fundTxnAmt;          
+
+    @Column(name = "fund_utr")
+    private String fundUTR;              
+
+    @Column(name = "fund_resp_remarks")
+    private String fundRespRemarks;     
+
+    @Column(name = "agent_npci_id")
+    private String agentNpciId;          
+
+    @Column(name = "txn_ref_id")
+    private String txnRefId;             
+
+    @Column(name = "fund_status")
+    private String fundStatus;           
+    
+}

src/main/java/com/billpaymentservice/bbps/entites/AgentFundTransferEntity.java

@@ -1,7 +1,12 @@
 package com.billpaymentservice.bbps.entites;
 
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/entites/AmountOption.java

@@ -1,10 +1,19 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 @Entity
 @Table(name = "amount_option")

src/main/java/com/billpaymentservice/bbps/entites/BBPSMastersData.java

@@ -24,7 +24,7 @@ import lombok.Setter;
 public class BBPSMastersData extends Auditable<String> {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/billpaymentservice/bbps/entites/BharatConnectMaster.java

@@ -1,10 +1,5 @@
 package com.billpaymentservice.bbps.entites;
 
-import java.time.LocalDateTime;
-
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-
 import com.billpaymentservice.bbps.audit.Auditable;
 
 import jakarta.persistence.Column;

src/main/java/com/billpaymentservice/bbps/entites/BillInitiate.java

@@ -0,0 +1,26 @@
+package com.billpaymentservice.bbps.entites;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@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;
+   
+}

src/main/java/com/billpaymentservice/bbps/entites/BillMaster.java

@@ -0,0 +1,49 @@
+package com.billpaymentservice.bbps.entites;
+import java.util.List;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "bill_master")
+@Builder
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class BillMaster {
+
+    @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;
+
+    // getters and setters
+}

src/main/java/com/billpaymentservice/bbps/entites/BillPayment.java

@@ -2,7 +2,14 @@ package com.billpaymentservice.bbps.entites;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import jakarta.persistence.*;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/entites/BillerDetails.java

@@ -1,14 +1,21 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import java.util.List;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
@@ -28,8 +35,7 @@ public class BillerDetails {
     @NotBlank(message = "Biller name cannot be blank")
     private String billerName;
 
-    @Column(name = "biller_alias_name", nullable = false)
-    @NotBlank(message = "Biller alias name cannot be blank")
+    @Column(name = "biller_alias_name")
     private String billerAliasName;
 
     @Column(name = "biller_category_name", nullable = false)
@@ -43,39 +49,36 @@ public class BillerDetails {
     @Column(name = "biller_accepts_adhoc", nullable = false)
     private boolean billerAcceptsAdhoc;
 
-    @Column(name = "parent_biller", nullable = false)
+    @Column(name = "parent_biller")
     private boolean parentBiller;
 
-    @Column(name = "parent_biller_id", nullable = false)
-    @NotBlank(message = "Parent biller ID cannot be blank")
+    @Column(name = "parent_biller_id")
     private String parentBillerId;
 
-    @Column(name = "biller_ownership", nullable = false)
+    @Column(name = "biller_ownership")
     @NotBlank(message = "Biller ownership is required (PSU or Private)")
     private String billerOwnerShp;
 
-    @Column(name = "biller_coverage", nullable = false)
-    @NotBlank(message = "Biller coverage cannot be blank")
+    @Column(name = "biller_coverage")
     private String billerCoverage;
 
-    @Column(name = "fetch_requirement", nullable = false)
+    @Column(name = "fetch_requirement")
     @NotBlank(message = "Fetch requirement is mandatory")
     private String fetchRequirement;
 
-    @Column(name = "payment_amount_exactness", nullable = false)
+    @Column(name = "payment_amount_exactness")
     @NotBlank(message = "Payment amount exactness is required")
     private String paymentAmountExactness;
 
-    @Column(name = "support_bill_validation", nullable = false)
+    @Column(name = "support_bill_validation")
     @NotBlank(message = "Support bill validation is required")
     private String supportBillValidation;
 
-    @Column(name = "biller_effctv_from", nullable = false)
+    @Column(name = "biller_effctv_from")
     @NotBlank(message = "Effective from date is required")
     private String billerEffctvFrom;
 
-    @Column(name = "biller_effctv_to", nullable = false)
-    @NotBlank(message = "Effective to date is required")
+    @Column(name = "biller_effctv_to")
     private String billerEffctvTo;
 
     @Column(name = "biller_temp_deactivation_start")
@@ -84,32 +87,25 @@ public class BillerDetails {
     @Column(name = "biller_temp_deactivation_end")
     private String billerTempDeactivationEnd;
 
-    @Column(name = "biller_description", nullable = false, length = 500)
-    @NotBlank(message = "Biller description cannot be blank")
+    @Column(name = "biller_description", length = 500)
     private String billerDescription;
 
-    @Column(name = "biller_response_type", nullable = false)
-    @NotBlank(message = "Biller response type is required (SINGLE or SELECTIVE)")
+    @Column(name = "biller_response_type")
     private String billerResponseType;
 
-    @Column(name = "plan_mdm_requirement", nullable = false)
-    @NotBlank(message = "Plan MDM requirement cannot be blank")
+    @Column(name = "plan_mdm_requirement")
     private String planMDMRequirement;
 
-    @Column(name = "status", nullable = false)
-    @NotBlank(message = "Status must be ACTIVE or INACTIVE")
+    @Column(name = "status")
     private String status;
 
-    @Column(name = "support_deemed", nullable = false)
-    @NotBlank(message = "Support deemed value is required (Yes/No)")
+    @Column(name = "support_deemed")
     private String supportDeemed;
 
-    @Column(name = "support_pending_status", nullable = false)
-    @NotBlank(message = "Support pending status is required (Yes/No)")
+    @Column(name = "support_pending_status")
     private String supportPendingStatus;
 
-    @Column(name = "biller_time_out", nullable = false)
-    @NotBlank(message = "Biller timeout is required")
+    @Column(name = "biller_time_out")
     private String billerTimeOut;
 
     @Column(name = "route_url")
@@ -151,7 +147,6 @@ public class BillerDetails {
 	 * @OneToMany(mappedBy = "biller", cascade = CascadeType.ALL, orphanRemoval =
 	 * true) private List<AdditionalInfo> billerAdditionalInfoPayments;
 	 */
-
     @OneToMany(mappedBy = "biller", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<InterchangeFeeConf> interchangeFeeConves;
 

src/main/java/com/billpaymentservice/bbps/entites/BillerPlanResponseParams.java

@@ -1,15 +1,17 @@
 package com.billpaymentservice.bbps.entites;
 
-import java.util.List;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
-import lombok.Getter;
-import lombok.Setter;
-import java.util.List;
 
 @Getter
 @Setter
@@ -17,7 +19,6 @@ import java.util.List;
 @ToString
 @Table(name = "biller_plan_response_params")
 public class BillerPlanResponseParams {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id; // Primary Key
@@ -25,7 +26,6 @@ public class BillerPlanResponseParams {
     @Column(name = "biller_plan_response_id", nullable = false, unique = true)
     @NotBlank(message = "Biller Plan Response ID cannot be blank")
     private String billerPlanResponseId;
-
     // ✅ params list — since it's not a separate table, we can store as JSON or text
     @Column(name = "params", columnDefinition = "TEXT")
     private String paramsJson;

src/main/java/com/billpaymentservice/bbps/entites/BillerResponse.java

@@ -0,0 +1,58 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "biller_response")
+@Getter
+@Setter
+public class BillerResponse {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(name = "amount")
+    private String amount;
+
+    @Column(name = "bill_date")
+    private String billDate;
+
+    @Column(name = "bill_id")
+    private String billId;
+
+    @Column(name = "bill_number")
+    private String billNumber;
+
+    @Column(name = "bill_period")
+    private String billPeriod;
+
+    @Column(name = "cust_conv_fee")
+    private String custConvFee;
+
+    @Column(name = "cou_cust_conv_fee")
+    private String couCustConvFee;
+
+    @Column(name = "due_date")
+    private String dueDate;
+
+    @Column(name = "customer_name")
+    private String customerName;
+
+    @Column(name = "amount_option")
+    private Boolean amountOption;
+
+    @ManyToOne
+    @JoinColumn(name = "bill_master_id")
+    private BillMaster billMaster;
+
+    // getters and setters
+}

src/main/java/com/billpaymentservice/bbps/entites/BillerResponseParams.java

@@ -1,11 +1,21 @@
 package com.billpaymentservice.bbps.entites;
 
 
-import jakarta.persistence.*;
+import java.util.List;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
-import java.util.List;
 
 @Getter
 @Setter
@@ -17,7 +27,7 @@ public class BillerResponseParams {
     @Column(name = "biller_response_id", nullable = false, unique = true)
     @NotBlank(message = "Biller Response ID is required")
     private String billerResponseId;
-
+  
     // 🔗 One-to-One Relationship with BillerDAO
     @OneToOne
     @JoinColumn(name = "biller_id", nullable = false)

src/main/java/com/billpaymentservice/bbps/entites/CustomParam.java

@@ -1,12 +1,19 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @Entity
+@ToString
 @Table(name = "custom_param")
 public class CustomParam {
 

src/main/java/com/billpaymentservice/bbps/entites/CustomerParam.java

@@ -1,16 +1,29 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
+import java.util.List;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
-
-import java.util.List;
+import lombok.ToString;
 
 @Getter
 @Setter
 @Entity
 @Table(name = "customer_param")
+@ToString
 public class CustomerParam {
 
     @Id

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamBill.java

@@ -0,0 +1,31 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@Table(name = "customer_param_bill")
+public class CustomerParamBill {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String name;
+    private String value;
+    private String type;
+
+    @ManyToOne
+    @JoinColumn(name = "bill_master_id")
+    private BillMaster billMaster;
+
+    // getters and setters
+}

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamDAO.java

@@ -1,7 +1,11 @@
 package com.billpaymentservice.bbps.entites;
 
 
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamGroups.java

@@ -1,12 +1,22 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
+import java.util.List;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.List;
-
 @Getter
 @Setter
 @Entity

src/main/java/com/billpaymentservice/bbps/entites/CustomerParamTransaction.java

@@ -0,0 +1,33 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@Table(name = "customer_params_transaction")
+public class CustomerParamTransaction {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String paramsId;
+    private String name;
+    private String value;
+    private String type;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "txn_id", referencedColumnName = "bank_txn_id")
+    private TransactionMaster transactionMaster;
+}
+

src/main/java/com/billpaymentservice/bbps/entites/DeviceBlockTag.java

@@ -0,0 +1,38 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@Table(name = "device_block_tag")
+public class DeviceBlockTag {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "tag_id")
+    private String tagId;
+
+    @Column(name = "value")
+    private String value;
+
+    // ✅ ManyToOne relation back to TransactionMaster
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "txn_id", referencedColumnName = "bank_txn_id")
+    private TransactionMaster transactionMaster;
+}

src/main/java/com/billpaymentservice/bbps/entites/DispositionDetails.java

@@ -1,7 +1,9 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

src/main/java/com/billpaymentservice/bbps/entites/Group.java

@@ -1,12 +1,24 @@
 package com.billpaymentservice.bbps.entites;
 
 
-import jakarta.persistence.*;
+import java.util.List;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 @Getter
 @Setter
 @Entity

src/main/java/com/billpaymentservice/bbps/entites/InterchangeFee.java

@@ -2,14 +2,20 @@ package com.billpaymentservice.bbps.entites;
 
 import java.util.List;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
-import lombok.Getter;
-import lombok.Setter;
-import java.util.List;
 
 @Getter
 @Setter

src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeConf.java

@@ -2,16 +2,20 @@ package com.billpaymentservice.bbps.entites;
 
 import java.util.List;
 
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
-
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
-import lombok.Getter;
-import lombok.Setter;
-import java.util.List;
-
 @Getter
 @Setter
 @Entity

src/main/java/com/billpaymentservice/bbps/entites/InterchangeFeeDetail.java

@@ -1,6 +1,13 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/entites/PaymentChannel.java

@@ -1,13 +1,18 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 @Getter
 @Setter
 @Entity

src/main/java/com/billpaymentservice/bbps/entites/PaymentInitiate.java

@@ -0,0 +1,31 @@
+package com.billpaymentservice.bbps.entites;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "payment_initiate")
+public class PaymentInitiate {
+
+    @Id
+    @Column(name = "req_id")
+    private String reqId;
+
+    @Column(name = "bank_txn_Id", nullable = false)
+    private String bankTxnId;
+
+    @Column(name = "txn_id")
+    private String txnId;
+
+    @Column(name = "status")
+    private String status;
+}

src/main/java/com/billpaymentservice/bbps/entites/PaymentMode.java

@@ -5,8 +5,6 @@ package com.billpaymentservice.bbps.entites;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
@@ -24,11 +22,9 @@ import lombok.ToString;
 @Table(name = "biller_payment_modes")
 @ToString
 public class PaymentMode {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
+    
+	
+	@Id //
     @Column(name = "payment_model_limit_id", unique = true, length = 50)
     @NotBlank(message = "Payment model limit ID cannot be blank")
     private String paymentModelLimitId;

src/main/java/com/billpaymentservice/bbps/entites/RemitterIdentity.java

@@ -1,6 +1,14 @@
 package com.billpaymentservice.bbps.entites;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/billpaymentservice/bbps/entites/TransactionMaster.java

@@ -0,0 +1,163 @@
+package com.billpaymentservice.bbps.entites;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "transaction_master")
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class TransactionMaster {
+
+    // 👇 JSON me "txn_id" aayega, ye DB me bank_txn_id column me save hoga
+    @Id
+    @JsonProperty("txn_id")
+    @Column(name = "bank_txn_id", nullable = false, unique = true)
+    private String bankTxnId;
+
+    // 👇 Apna internal transaction id, manually generate or system ke through
+    @Column(name = "txn_id")
+    private String txnId;
+
+    @Column(name = "req_id")
+    private String reqId;
+
+    @Column(name = "ref_id")
+    private String refId;
+
+    @Column(name = "txn_npci_id")
+    private String txnNpciId;
+
+    @Column(name = "payment_ref_id")
+    private String paymentRefId;
+
+    @Column(name = "remitter_name")
+    private String remitterName;
+
+    @Column(name = "order_id")
+    private String orderId;
+
+    @Column(name = "bill_id")
+    private String billId;
+
+    @Column(name = "user_type")
+    private String userType;
+
+    @Column(name = "user_id")
+    private String userId;
+
+    @Column(name = "txn_amount")
+    private Double txnAmount;
+
+    @Column(name = "total_txn_amount")
+    private Double totalTxnAmount;
+
+    @Column(name = "biller_id")
+    private String billerId;
+
+    @Column(name = "biller_category")
+    private String billerCategory;
+
+    @Column(name = "biller_name")
+    private String billerName;
+
+    @Column(name = "client_req_id")
+    private String clientReqId;
+
+    @Column(name = "off_us_pay")
+    private String offUsPay;
+
+    @Column(name = "split_pay")
+    private String splitPay;
+
+    @Column(name = "quick_pay")
+    private String quickPay;
+
+    @Column(name = "payment_mode")
+    private String paymentMode;
+
+    @Column(name = "agent_payment_information", columnDefinition = "TEXT")
+    private String agentPaymentInformation;
+
+    @Column(name = "cust_conv_fee")
+    private Double custConvFee;
+
+    @Column(name = "currency")
+    private String currency;
+
+    @Column(name = "status")
+    private String status;
+
+    @Column(name = "requested_ip")
+    private String requestedIp;
+
+    @Column(name = "customer_mob_no")
+    private String customerMobNo;
+
+    @Column(name = "mac_address")
+    private String macAddress;
+
+    @Column(name = "split_pay_amount")
+    private Double splitPayAmount;
+
+    @Column(name = "cou_cust_conv_fee")
+    private Double couCustConvFee;
+
+    @Column(name = "settlement_verification")
+    private Boolean settlementVerification;
+
+    @Column(name = "fund_txn_type")
+    private String fundTxnType;
+
+    @Column(name = "reason", columnDefinition = "TEXT")
+    private String reason;
+
+    @Column(name = "amount_tags", columnDefinition = "TEXT")
+    private String amountTags;
+
+    @Column(name = "payment_information", columnDefinition = "TEXT")
+    private String paymentInformation;
+
+    // ✅ Relation with DeviceBlockTagEntity
+    @OneToMany(mappedBy = "transactionMaster", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<DeviceBlockTag> deviceBlockTags;
+
+    // ✅ Relation with CustomerParamEntity
+    @OneToMany(mappedBy = "transactionMaster", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<CustomerParamTransaction> customerParams;
+
+    @Column(name = "plan_id")
+    private String planId;
+
+    @Column(name = "plan_type")
+    private String planType;
+
+    @Column(name = "creation_date")
+    private String creationDate;
+
+    @Column(name = "modified_date")
+    private String modifiedDate;
+
+    @Column(name = "created_epoch_date")
+    private Long createdEpochDate;
+
+    @Column(name = "modified_epoch_date")
+    private Long modifiedEpochDate;
+}

src/main/java/com/billpaymentservice/bbps/entites/TransactionStatus.java

@@ -1,66 +0,0 @@
-package com.billpaymentservice.bbps.entites;
-
-import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
-import java.time.LocalDateTime;
-import java.util.List;
-
-
-@Entity
-@Getter
-@Setter
-@Table(name = "transaction_status")
-public class TransactionStatus {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(nullable = false, unique = true)
-    private String txnId;
-
-    @Column(nullable = false)
-    private String refId;
-
-    private String txnNpciId;
-    private String orderId;
-    private String billId;
-    private String userType;
-    private String userId;
-    private Double txnAmount;
-    private Double totalTxnAmount;
-    private String billerId;
-    private String billerCategory;
-    private String billerName;
-    private String clientReqId;
-    private String offUsPay;
-    private String splitPay;
-    private String quickPay;
-    private String paymentMode;
-    private Double custConvFee;
-    private String currency;
-    private String status;
-    private String requestedIp;
-    private String customerMobNo;
-    private String macAddress;
-    private Double splitPayAmount;
-    private Double couCustConvFee;
-    private Boolean settlementVerification;
-    private String fundTxnType;
-    private String reason;
-    private String planId;
-    private String planType;
-    private LocalDateTime creationDate;
-    private LocalDateTime modifiedDate;
-    private Long createdEpochDate;
-    private Long modifiedEpochDate;
-
-    @OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "fund_transfer_id")
-    private AgentFundTransferEntity agentFundTransfer;
-
-    @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn(name = "transaction_id")
-    private List<CustomerParamDAO> customerParamsDAO;
-}