Merge branch 'develop' into feature1

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

@@ -0,0 +1,12 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class FaqDetailsResponse {
+
+	private String name;
+	private String value;
+}

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

@@ -0,0 +1,21 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class GeneralResponse {
+
+	private String statusCode;
+	private String status;
+	private String message;
+	private String remarks;
+
+}

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

@@ -0,0 +1,23 @@
+package com.billpaymentservice.bbps.dto;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.response.CategoryResponse;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class MasterApiResponse {
+
+	private GeneralResponse generalResp;
+	private List<CategoryResponse> categoryRespList;
+
+}

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

@@ -0,0 +1,25 @@
+package com.billpaymentservice.bbps.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class MasterCategoryBillerResponse {
+
+	private String billerId;
+	private String billerName;
+	private String billerType;
+	private String billerCategory;
+	private String billerCoverage;
+	private String billerResponseType;
+	private String billerDescription;
+	private String planMDMRequirement;
+	private String adhocBiller;
+	private String paymentAmountExactness;
+
+}

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

@@ -0,0 +1,13 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MerchantRequestModel {
+
+	private String mid;
+	private String secretKey;
+	private String txnId;
+}

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

@@ -0,0 +1,26 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.GeneralResponse;
+import com.billpaymentservice.bbps.dto.MasterCategoryBillerResponse;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class BillerResponse {
+
+	private int pageNo;
+	private int pageSize;
+	private long totalElements;
+	private int totalPages;
+	private GeneralResponse generalResp;
+	private List<MasterCategoryBillerResponse> billerResp;
+
+}

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

@@ -0,0 +1,28 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.FaqDetailsResponse;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CategoryResponse {
+
+	private String categoryId;
+	private String categoryName;
+	private String categoryIcon;
+	private String categoryDomain;
+	private String buttonName;
+	private String textArea;
+	private List<FaqDetailsResponse> faqDetailsList;
+
+}