Merge branch 'develop' of https://git.zeptic.in/himanshu/bbps into feature3
This commit is contained in:
@@ -0,0 +1,11 @@
|
|||||||
|
package com.billpaymentservice.bbps.dto;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class AdditionalInfoBillValidateDTO {
|
||||||
|
String name;
|
||||||
|
String value;
|
||||||
|
}
|
||||||
+2
-1
@@ -2,6 +2,7 @@ package com.billpaymentservice.bbps.dto.response;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.billpaymentservice.bbps.dto.AdditionalInfoBillValidateDTO;
|
||||||
import com.billpaymentservice.bbps.dto.CustomerParamDAO;
|
import com.billpaymentservice.bbps.dto.CustomerParamDAO;
|
||||||
import com.billpaymentservice.bbps.dto.GeneralResp;
|
import com.billpaymentservice.bbps.dto.GeneralResp;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
@@ -28,7 +29,7 @@ public class FetchBillValidateResponse {
|
|||||||
private String actionType;
|
private String actionType;
|
||||||
private String userId;
|
private String userId;
|
||||||
private String billerResponse;
|
private String billerResponse;
|
||||||
private String additionalInfo;
|
private List<AdditionalInfoBillValidateDTO> additionalInfo;
|
||||||
private List<CustomerParamDAO> customerParams;
|
private List<CustomerParamDAO> customerParams;
|
||||||
private String planInfoDaos;
|
private String planInfoDaos;
|
||||||
private String creationDate;
|
private String creationDate;
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class BillValidation {
|
|||||||
private String billerResponse;
|
private String billerResponse;
|
||||||
|
|
||||||
@Column(name = "additional_info", columnDefinition = "TEXT")
|
@Column(name = "additional_info", columnDefinition = "TEXT")
|
||||||
private String additionalInfo;
|
private String additionalInfo;
|
||||||
|
|
||||||
// 👇 Proper nested customer params (OneToMany)
|
// 👇 Proper nested customer params (OneToMany)
|
||||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bill")
|
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bill")
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ public class AgentServiceImpl implements AgentService {
|
|||||||
String txnId = helper.generateTxnId(15);
|
String txnId = helper.generateTxnId(15);
|
||||||
String reqId = billFetchByBillIdRequest.getReqId();
|
String reqId = billFetchByBillIdRequest.getReqId();
|
||||||
String billId = billFetchByBillIdRequest.getBillId();
|
String billId = billFetchByBillIdRequest.getBillId();
|
||||||
String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + billFetchByBillIdRequest.getBillId();
|
String fullUrl = agentDtaUrl + BBPSConstant.BILL_FETCH_BY_ID + "1ced7566-1add-4e01-9ed6-04cd67ac9684";
|
||||||
|
|
||||||
helper.validateMerchant(billFetchByBillIdRequest.getMid());
|
helper.validateMerchant(billFetchByBillIdRequest.getMid());
|
||||||
|
|
||||||
|
|||||||
@@ -20,9 +20,9 @@ swagger.server.description=Local Development Server
|
|||||||
# DataSource
|
# DataSource
|
||||||
spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
|
spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
|
||||||
spring.datasource.username=postgres
|
spring.datasource.username=postgres
|
||||||
spring.datasource.password=UAT@DB_2025
|
#spring.datasource.password=UAT@DB_2025
|
||||||
|
|
||||||
#spring.datasource.password=himanshu@123
|
spring.datasource.password=himanshu@123
|
||||||
spring.datasource.driver-class-name=org.postgresql.Driver
|
spring.datasource.driver-class-name=org.postgresql.Driver
|
||||||
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user