Merge pull request 'feature3' (#8) from feature3 into develop

Reviewed-on: https://git.zeptic.in/himanshu/bbps/pulls/8

src/main/java/com/billpaymentservice/bbps/controller/MasterDataController.java

@@ -90,7 +90,7 @@ public class MasterDataController {
 	}
 
 	/** POST Customer Param Groups API Fetch Category Wise from BBPS URL **/
-	@PostMapping(value = "/customerParamGroups", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/customerParamGroupsByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> getCustomerParamGroup(
 			@Validated @RequestBody BillerDetailRequest requestModel) {
 		return ResponseEntity.ok(masterDataService.fetchCustomerParamGroup(requestModel));
@@ -100,7 +100,7 @@ public class MasterDataController {
 	 * POST Fetch All AMount Options By Biller Id API Fetch Category Wise from BBPS
 	 * URL
 	 **/
-	@PostMapping(value = "/fetchAllAmountOptionsByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/fetchAmountOptionsByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> fetchAllMasterAmountOptionsByBillerId(
 			@Validated @RequestBody BillerDetailRequest requestModel) {
 		return ResponseEntity.ok(masterDataService.fetchAllMasterAmountOption(requestModel));
@@ -110,7 +110,7 @@ public class MasterDataController {
 	 * POST Fetch All AMount Options By Biller Id API Fetch Category Wise from BBPS
 	 * URL
 	 **/
-	@PostMapping(value = "/fetchAllPlanCategories", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/fetchAllPlanCategoriesByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> fetchPlanCategories(@Validated @RequestBody BillerDetailRequest requestModel) {
 		return ResponseEntity.ok(masterDataService.fetchPlanCategorie(requestModel));
 	}

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

@@ -25,7 +25,7 @@ public abstract class BaseClass {
 	@NotBlank(message = "Request ID cannot be null or blank")
 	private String reqId;
     
-    private String txnId;
+    //private String txnId;
    
     private DeviceDetail deviceDetial;
 

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

@@ -6,9 +6,8 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class TransactionStatusRequest extends BaseClass{
+public class TransactionStatusRequest extends BaseClass {
-	
 	@NotNull
-    private String txnId; // UUID of transaction
+	private String txnId; // UUID of transaction
 
 }