update code resolved conflict

This commit is contained in:
Mohd-Arham
2025-11-21 10:55:54 +05:30
32 changed files with 964 additions and 419 deletions
@@ -2,17 +2,23 @@ package com.billpaymentservice.bbps.service;
import com.billpaymentservice.bbps.dto.ResponseModel;
import com.billpaymentservice.bbps.dto.request.BillFetchByBillIdRequest;
import com.billpaymentservice.bbps.dto.request.BillFetchByClientIdRequest;
import com.billpaymentservice.bbps.dto.request.BillValidateByClientIdRequest;
import com.billpaymentservice.bbps.dto.request.FetchBillRequest;
import com.billpaymentservice.bbps.dto.request.FetchBillValidatestRequest;
public interface AgentService {
ResponseModel initiateBillFetch(FetchBillRequest fetchBillRequest);
public ResponseModel initiateBillFetch(FetchBillRequest fetchBillRequest);
ResponseModel fetchBillById(BillFetchByBillIdRequest billFetchByBillIdRequest);
public ResponseModel fetchBillById(BillFetchByBillIdRequest billFetchByBillIdRequest);
ResponseModel initiateBillValidate(FetchBillValidatestRequest fetchBillValidateRequest);
public ResponseModel initiateBillValidate(FetchBillValidatestRequest fetchBillValidateRequest);
ResponseModel initiateBillValidateByBillId(BillFetchByBillIdRequest billRequest);
public ResponseModel initiateBillValidateByBillId(BillFetchByBillIdRequest billRequest);
ResponseModel fetchBillByClientReqId(BillFetchByClientIdRequest billFetchByClientIdRequest);
ResponseModel fetchBillValidateByClientReqId( BillValidateByClientIdRequest billValidateByClientIdRequest);
}
@@ -3,6 +3,9 @@ package com.billpaymentservice.bbps.service;
import com.billpaymentservice.bbps.dto.ResponseModel;
import com.billpaymentservice.bbps.dto.request.AllMasterOptionsRequest;
import com.billpaymentservice.bbps.dto.request.ComplainStatusRequest;
import com.billpaymentservice.bbps.dto.request.ReOpenComplain;
import com.billpaymentservice.bbps.dto.request.TxnStatusRequest;
import com.billpaymentservice.bbps.dto.request.ViewAllComplaintsRequest;
import com.billpaymentservice.bbps.dto.request.ComplaintRequestDTO;
import com.billpaymentservice.bbps.dto.request.GetTicketLatestStausRequest;
import com.billpaymentservice.bbps.dto.request.TxnStatusRequest;
@@ -22,6 +25,7 @@ public interface ComplainService {
ResponseModel checkTxnStatus(TxnStatusRequest request);
ResponseModel ViewAllComplaints(ViewAllComplaintsTicketsRequest request);
}
@@ -3,12 +3,14 @@ package com.billpaymentservice.bbps.service;
import com.billpaymentservice.bbps.dto.ResponseModel;
import com.billpaymentservice.bbps.dto.request.BillPaymentRequest;
import com.billpaymentservice.bbps.dto.request.TransactionStatusRequest;
import com.billpaymentservice.bbps.dto.request.TrasactionStatusByClientReqIdRequest;
public interface PaymentService {
public ResponseModel initiatePayment(BillPaymentRequest billPaymentRequest);
public ResponseModel checkTrasactionStatus(TransactionStatusRequest transactionStatusRequest);
ResponseModel checkTrasactionStatusByClientReqId(TrasactionStatusByClientReqIdRequest transactionStatusRequest);
}