update code resolved conflict

src/main/java/com/billpaymentservice/bbps/dto/ComplainDetailsDto.java

@@ -2,11 +2,14 @@ package com.billpaymentservice.bbps.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Setter
 @Getter
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ComplainDetailsDto {
 
 	@JsonProperty("TicketId")

src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java

@@ -20,49 +20,35 @@ import lombok.ToString;
 public abstract class BaseClass {
 
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	@NotBlank(message = "MID cannot be null or blank")
 	private String mid;
      
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 
 	@NotBlank(message = "Secret key cannot be null or blank")
 	private String secretKey;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	@NotBlank(message = "Request ID cannot be null or blank")
 	private String reqId;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private DeviceDetail deviceDetial;
 	// ✅ 10 User Defined Fields (UDF1–UDF10)
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf1;
 
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf2;
 
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf3;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf4;
     
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf5;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf6;
      
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf7;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf8;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf9;
 	
-	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private String udf10;
 }

src/main/java/com/billpaymentservice/bbps/dto/request/BillFetchByClientIdRequest.java

@@ -0,0 +1,12 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BillFetchByClientIdRequest extends BaseClass{
+	
+	private String clientReqId;
+
+}

src/main/java/com/billpaymentservice/bbps/dto/request/BillPaymentRequest.java

@@ -21,6 +21,7 @@ public class BillPaymentRequest extends BaseClass {
  private String customerMobNo;
  private Integer txnAmount;
  private String paymentRefId;
+ private String clientReqId;
  private String paymentChannel;
 
  private List<DeviceBlockTagRequest> deviceBlockTags;

src/main/java/com/billpaymentservice/bbps/dto/request/BillValidateByClientIdRequest.java

@@ -0,0 +1,12 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BillValidateByClientIdRequest extends BaseClass{
+	
+	private String clientReqId;
+
+}

src/main/java/com/billpaymentservice/bbps/dto/request/FetchBillValidatestRequest.java

@@ -22,6 +22,7 @@ public class FetchBillValidatestRequest extends BaseClass {
 	private String billerCategory; // String, CategoryResponseList of the biller
 	@NotNull
 	private String customerMobNo; // String, Mobile of the Customer
+	private String clientReqId;
 
 	// Optional Fields
 	private String macAddress; // Alphanumeric MAC Address of the Agent Server

src/main/java/com/billpaymentservice/bbps/dto/request/TrasactionStatusByClientReqIdRequest.java

@@ -0,0 +1,11 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+@Getter
+@Setter
+public class TrasactionStatusByClientReqIdRequest extends BaseClass{
+	
+	private String clientReqId;
+
+}

src/main/java/com/billpaymentservice/bbps/dto/request/ViewAllComplaintsRequest.java

@@ -0,0 +1,14 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ViewAllComplaintsRequest  extends BaseClass{
+
+    private String statusType;   // e.g. COMPLAINT_OPEN_SUCCESS
+    private Integer pageNo;      // default 0
+    private Integer pageSize;    // default 10
+    
+}

src/main/java/com/billpaymentservice/bbps/dto/response/ViewAllComplaintsResponse.java

@@ -0,0 +1,22 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.ComplainDetailsDto;
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ViewAllComplaintsResponse {
+    private List<ComplainDetailsDto> complaintsList;
+    private GeneralResp generalResp;
+    private Integer pageNo;
+    private Integer pageSize;
+    private Integer totalPages;
+    private Long totalElements;
+}

src/main/java/com/billpaymentservice/bbps/dto/response/ViewComplainByIdResponse.java

@@ -5,12 +5,14 @@ import java.util.List;
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.ViewComplaintDTO;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ViewComplainByIdResponse {
 	private List<ViewComplaintDTO> tickets;
 	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)

src/main/java/com/billpaymentservice/bbps/dto/sentRequest/BillPaymentForwardRequest.java

@@ -0,0 +1,41 @@
+package com.billpaymentservice.bbps.dto.sentRequest;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.request.AmountBreakRequest;
+import com.billpaymentservice.bbps.dto.request.CustomerParamTagRequest;
+import com.billpaymentservice.bbps.dto.request.DeviceBlockTagRequest;
+import com.billpaymentservice.bbps.dto.request.RemitterIdentityRequest;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class BillPaymentForwardRequest {
+
+    private String tenantId;
+    private String refId;
+    private String billId;
+    private boolean amountOptions;
+    private String paymentMode;
+    private String paymentInformation;
+    private String billerId;
+    private String billerName;
+    private String billerCategory;
+    private String macAdress;
+    private String customerMobNo;
+    private Integer txnAmount;
+    private String paymentRefId;
+    private String clientReqId;
+    private String paymentChannel;
+
+    private List<DeviceBlockTagRequest> deviceBlockTags;
+    private List<CustomerParamTagRequest> customerParamsRequest;
+    private List<RemitterIdentityRequest> remitterIdentity;
+    private List<AmountBreakRequest> amountBreakSet;
+}

src/main/java/com/billpaymentservice/bbps/dto/sentRequest/FetchBillForwardRequest.java

@@ -0,0 +1,24 @@
+package com.billpaymentservice.bbps.dto.sentRequest;
+
+import java.util.List;
+import com.billpaymentservice.bbps.dto.CustomerParamsRequest;
+import com.billpaymentservice.bbps.dto.RemitterIdentity;
+import com.billpaymentservice.bbps.dto.Tag;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class FetchBillForwardRequest {
+	 private String billerId;
+	    private String billerName;
+	    private String billerCategory;
+	    private String clientReqId;
+	    private String macAdress;
+	    private String customerMobNo;
+	    private String remitterName;
+	    private String paymentChannel;
+	    private List<Tag> deviceBlockTags;
+	    private CustomerParamsRequest customerParamsRequest;
+	    private List<RemitterIdentity> remitterIdentity;
+}

src/main/java/com/billpaymentservice/bbps/dto/sentRequest/FetchBillValidatestForwardRequest.java

@@ -0,0 +1,24 @@
+package com.billpaymentservice.bbps.dto.sentRequest;
+
+import com.billpaymentservice.bbps.dto.CustomerParamsRequest;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class FetchBillValidatestForwardRequest {
+
+    private String billerId;
+    private String billerName;
+    private String billerCategory;
+    private String customerMobNo;
+    private String clientReqId;
+    private String macAddress;
+    private CustomerParamsRequest customerParamsRequest;
+
+}