Added remitterAddress, beneficiaryName, beneficiaryAddress, senderAcctType, beneficiaryAcctType, beneficiaryBankName, beneficiaryBranchName, commissionAmount to transactions as told by C-Edge. Also removed errorMsg from TransactionFailureResponse class. Refactored code for more readability. Removed application logs from STDOUT.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package net.ipksindia.dao
|
||||
|
||||
import net.ipksindia.model.TransactionRequest
|
||||
import net.ipksindia.ItemNotFoundException
|
||||
import net.ipksindia.model.TransactionRequest
|
||||
import java.sql.Date
|
||||
import java.sql.ResultSet
|
||||
import java.sql.SQLException
|
||||
@@ -9,7 +9,7 @@ import java.sql.SQLException
|
||||
class TransactionDao {
|
||||
|
||||
private val singleTransactionRequestQuery = """
|
||||
SELECT
|
||||
SELECT
|
||||
txn_no,
|
||||
TRIM(src_ac_no) AS src_ac_no,
|
||||
TRIM(dest_ac_no) AS dest_ac_no,
|
||||
@@ -32,12 +32,16 @@ class TransactionDao {
|
||||
ipks_accno AS pacs_acc_no,
|
||||
da.link_accno AS cbs_sb_acc_no,
|
||||
'pacs_db' AS db_name,
|
||||
kh.mobile_no
|
||||
FROM neft_rtgs_txn t
|
||||
JOIN dep_account da ON t.ipks_accno = da.key_1
|
||||
JOIN kyc_hdr kh ON da.customer_no = kh.cif_no
|
||||
WHERE
|
||||
t.txn_no = ?
|
||||
kh.mobile_no,
|
||||
kh.address_1 || kh.address_2 AS remitter_address,
|
||||
if.idi_bank_name AS beneficiary_bank_name,
|
||||
if.idi_branch_name AS beneficiary_branch_name
|
||||
FROM neft_rtgs_txn t
|
||||
JOIN dep_account da ON t.ipks_accno = da.key_1
|
||||
JOIN kyc_hdr kh ON da.customer_no = kh.cif_no
|
||||
JOIN idi_ifsc_dir_info if ON if.idi_ifsc_code = t.ifsc_code
|
||||
WHERE
|
||||
t.txn_no = ?
|
||||
""".trimIndent()
|
||||
|
||||
private val transactionUpdateQuery = """
|
||||
@@ -122,8 +126,8 @@ private fun mapToObject(rs: ResultSet): TransactionRequest? {
|
||||
date = rs.getDate("txn_date").toLocalDate(),
|
||||
tellerId = rs.getString("teller_id"),
|
||||
status = rs.getString("status"),
|
||||
beneficiaryName = rs.getString("beneficiary_name"),
|
||||
beneficiaryAddress = rs.getString("beneficiary_add"),
|
||||
beneficiaryName = rs.getString("beneficiary_name") ?: "UNKNOWN",
|
||||
beneficiaryAddress = rs.getString("beneficiary_add") ?: "UNKNOWN",
|
||||
pacsId = rs.getString("pacs_id"),
|
||||
commissionTransactionNumber = rs.getString("comm_txn_no"),
|
||||
commissionAmount = rs.getString("comm_txn_amt"),
|
||||
@@ -132,7 +136,12 @@ private fun mapToObject(rs: ResultSet): TransactionRequest? {
|
||||
remitterName = rs.getString("remitter_name"),
|
||||
pacsAccountNumber = rs.getString("pacs_acc_no"),
|
||||
linkedCBSAccountNumber = rs.getString("cbs_sb_acc_no"),
|
||||
mobileNumber = rs.getString("mobile_no") ?: "999999999"
|
||||
mobileNumber = rs.getString("mobile_no") ?: "999999999",
|
||||
remitterAddress = rs.getString("remitter_address"),
|
||||
beneficiaryBankName = rs.getString("beneficiary_bank_name"),
|
||||
beneficiaryBranchName = rs.getString("beneficiary_branch_name"),
|
||||
senderAcctType = "10", //for savings as shared by c-edge
|
||||
beneficiaryAcctType = "10" //for savings as shared by c-edge
|
||||
)
|
||||
}
|
||||
return null
|
||||
|
||||
Reference in New Issue
Block a user