save billerdata to in database working code
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
package com.billpaymentservice.bbps.dto;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
@@ -10,13 +11,12 @@ public class AgentFundTransfer {
|
||||
@NotBlank private String fundTxnReferenceId;
|
||||
@NotBlank private String fundTxnRemarks;
|
||||
@NotBlank private String fundTxnDate;
|
||||
|
||||
@NotNull private Double fundTxnAmt;
|
||||
|
||||
@NotBlank private String fundUTR;
|
||||
|
||||
private String fundRespRemarks;
|
||||
private String agentNpciId;
|
||||
private String txnRefId;
|
||||
|
||||
private String tenantId;
|
||||
@NotBlank private String fundStatus; // FUND_TRANSFER_SUCCESS or FUND_TRANSFER_FAILED
|
||||
}
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class CustomParam {
|
||||
public class CustomParamDTO {
|
||||
private String customParamName;
|
||||
private String dataType;
|
||||
private boolean optional;
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.billpaymentservice.bbps.dto;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DeviceBlockTag {
|
||||
private String name;
|
||||
private String tagId;
|
||||
private String value;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.billpaymentservice.bbps.dto;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
|
||||
public class DispositionsDTO {
|
||||
private String dispositionId;
|
||||
private String dispositionDescr;
|
||||
private String tenantId;
|
||||
}
|
||||
@@ -4,11 +4,13 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@ToString
|
||||
public class GeneralResp {
|
||||
private String statusCode;
|
||||
private String status;
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
package com.billpaymentservice.bbps.dto;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
public class TransactionDAO {
|
||||
|
||||
@NotBlank private String txnId;
|
||||
@NotBlank private String refId;
|
||||
|
||||
private String txnNpciId;
|
||||
|
||||
@NotBlank private String orderId;
|
||||
@NotBlank private String billId;
|
||||
@NotBlank private String userType;
|
||||
@NotBlank private String userId;
|
||||
|
||||
@NotNull private Double txnAmount;
|
||||
@NotNull private Double totalTxnAmount;
|
||||
|
||||
@NotBlank private String billerId;
|
||||
@NotBlank private String billerCategory;
|
||||
@NotBlank private String billerName;
|
||||
|
||||
private String clientReqId;
|
||||
private String offUsPay;
|
||||
private String splitPay;
|
||||
private String quickPay;
|
||||
private String paymentMode;
|
||||
|
||||
private Double custConvFee;
|
||||
private String currency;
|
||||
private String status;
|
||||
private String requestedIp;
|
||||
private String customerMobNo;
|
||||
private String macAddress;
|
||||
|
||||
private Double splitPayAmount;
|
||||
private Double couCustConvFee;
|
||||
|
||||
private Boolean settlementVerification;
|
||||
private String fundTxnType;
|
||||
private String reason;
|
||||
|
||||
private List<String> amountTags;
|
||||
private List<String> customerParamsDAOS;
|
||||
private List<String> paymentInformation;
|
||||
|
||||
private List<CustomerParamDAO> customerParamsDAO;
|
||||
|
||||
private String planId;
|
||||
private String planType;
|
||||
|
||||
private LocalDateTime creationDate;
|
||||
private LocalDateTime modifiedDate;
|
||||
|
||||
private Long createdEpochDate;
|
||||
private Long modifiedEpochDate;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package com.billpaymentservice.bbps.dto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
|
||||
public class TransactionDTO {
|
||||
|
||||
@NotBlank private String txnId;
|
||||
@NotBlank private String refId;
|
||||
private String txnNpciId;
|
||||
private String paymentRefId;
|
||||
private String remitterName;
|
||||
|
||||
|
||||
@NotBlank private String orderId;
|
||||
@NotBlank private String billId;
|
||||
@NotBlank private String userType;
|
||||
@NotBlank private String userId;
|
||||
|
||||
@NotNull private Double txnAmount;
|
||||
@NotNull private Double totalTxnAmount;
|
||||
|
||||
@NotBlank private String billerId;
|
||||
@NotBlank private String billerCategory;
|
||||
@NotBlank private String billerName;
|
||||
|
||||
private String clientReqId;
|
||||
private String offUsPay;
|
||||
private String splitPay;
|
||||
private String quickPay;
|
||||
private String paymentMode;
|
||||
private String agentPaymentInformation;
|
||||
|
||||
private Double custConvFee;
|
||||
private String currency;
|
||||
private String status;
|
||||
private String requestedIp;
|
||||
private String customerMobNo;
|
||||
private String macAddress;
|
||||
|
||||
private Double splitPayAmount;
|
||||
private Double couCustConvFee;
|
||||
|
||||
private Boolean settlementVerification;
|
||||
private String fundTxnType;
|
||||
private String reason;
|
||||
|
||||
private List<String> amountTags;
|
||||
private List<String> customerParamsDAOS;
|
||||
private List<String> paymentInformation;
|
||||
private List<DeviceBlockTag> deviceBlockTags;
|
||||
|
||||
|
||||
private List<CustomerParamDAO> customerParamsDAO;
|
||||
|
||||
private String planId;
|
||||
private String planType;
|
||||
|
||||
// ✅ Date fields as String (for JSON compatibility)
|
||||
private String creationDate;
|
||||
private String modifiedDate;
|
||||
|
||||
private Long createdEpochDate;
|
||||
private Long modifiedEpochDate;
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package com.billpaymentservice.bbps.dto.request;
|
||||
|
||||
public class DispositionRequest extends BaseClass {
|
||||
|
||||
}
|
||||
@@ -3,9 +3,11 @@ package com.billpaymentservice.bbps.dto.response;
|
||||
import com.billpaymentservice.bbps.dto.GeneralResp;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class BillPaymentResponse {
|
||||
|
||||
private String txnId;
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package com.billpaymentservice.bbps.dto.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.billpaymentservice.bbps.dto.ContactMaster;
|
||||
import com.billpaymentservice.bbps.dto.CustomParam;
|
||||
import com.billpaymentservice.bbps.dto.CustomParamDTO;
|
||||
import com.billpaymentservice.bbps.dto.GeneralResp;
|
||||
import com.billpaymentservice.bbps.entites.CustomerParam;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
@@ -20,5 +19,5 @@ import lombok.Setter;
|
||||
public class CustomParamResp {
|
||||
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||
private GeneralResp generalResp;
|
||||
private List<CustomParam> customParamResp;
|
||||
private List<CustomParamDTO> customParamResp;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.billpaymentservice.bbps.dto.response;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.billpaymentservice.bbps.dto.DispositionsDTO;
|
||||
import com.billpaymentservice.bbps.dto.GeneralResp;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class DispositionResponse {
|
||||
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||
private GeneralResp generalResp;
|
||||
List<DispositionsDTO> dispositionsList;
|
||||
}
|
||||
+2
-2
@@ -2,7 +2,7 @@ package com.billpaymentservice.bbps.dto.response;
|
||||
|
||||
import com.billpaymentservice.bbps.dto.AgentFundTransfer;
|
||||
import com.billpaymentservice.bbps.dto.GeneralResp;
|
||||
import com.billpaymentservice.bbps.dto.TransactionDAO;
|
||||
import com.billpaymentservice.bbps.dto.TransactionDTO;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import lombok.Getter;
|
||||
@@ -13,7 +13,7 @@ import lombok.Setter;
|
||||
public class TransactionStatusResponse {
|
||||
|
||||
@JsonProperty("transactionDAO")
|
||||
private TransactionDAO transactionDAO;
|
||||
private TransactionDTO transactionDAO;
|
||||
|
||||
@JsonProperty("agentFundTransfer")
|
||||
private AgentFundTransfer agentFundTransfer;
|
||||
|
||||
Reference in New Issue
Block a user