update resolve conflict

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

@@ -1,6 +1,7 @@
 package com.billpaymentservice.bbps.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -24,7 +25,9 @@ public class ViewComplaintDTO {
     private String modifiedEpochDate;
     private String refId;
     private String status;
-    private String txnId;
+    @JsonProperty("txnId")
+    private String bankTxnId;
+
     private String userId;
     private String category;
     private String billerName;

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

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

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

@@ -0,0 +1,24 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import com.billpaymentservice.bbps.dto.GeneralResp;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TxnStatusResponse {
+
+    private String txnStatusReqRefId;
+    private String agentId;
+    private String billerId;
+    private String approvalRefNum;
+    private String txnRefId;
+    private String mti;
+    private String txnDate; // RFC3339 format
+    private String amount;
+    private String txnStatus;        // SUCCESS / FAILED
+    private String customerMobile;
+
+    private GeneralResp generalResp;
+}