diff --git a/SendMail/API/ThirdPartyAPI.cs b/SendMail/API/ThirdPartyAPI.cs index caa530e..a612e99 100644 --- a/SendMail/API/ThirdPartyAPI.cs +++ b/SendMail/API/ThirdPartyAPI.cs @@ -1,7 +1,7 @@ using Common; using JMETxnPushScheduler.Business; using JMETxnPushScheduler.Common; -using log4net; + using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; diff --git a/SendMail/App.config b/SendMail/App.config index 4c161a7..70d1dc0 100644 --- a/SendMail/App.config +++ b/SendMail/App.config @@ -9,12 +9,12 @@ - + - + diff --git a/SendMail/Business/TxnPush.cs b/SendMail/Business/TxnPush.cs index bf4622d..0809b52 100644 --- a/SendMail/Business/TxnPush.cs +++ b/SendMail/Business/TxnPush.cs @@ -49,6 +49,8 @@ namespace JMETxnPushScheduler.Business { _txnPush.UpdateTxnPost(item["ID"].ToString(), result.Extra); GetTxnDetails(item["ID"].ToString()); + + _txnPush.UpdateTxnInstantPaid(item["ID"].ToString()); } else if (result.ResponseCode == "100")//Transaction has been processed for Bank Deposit. { @@ -61,6 +63,14 @@ namespace JMETxnPushScheduler.Business // GetTxnDetails(item["ID"].ToString()); } } + else if (_dbRes.Msg == "394449") //GCC + { + if (result.ResponseCode == "0") + { + _txnPush.UpdateTxnPost(item["ID"].ToString(), result.Extra, result.Id); + GetTxnDetails(item["ID"].ToString()); + } + } else { if (result.ResponseCode == "0") @@ -201,6 +211,7 @@ namespace JMETxnPushScheduler.Business var request = new TFReleaseTxnRequest() { TfPin = item["CONTROLNO"].ToString(), + TxnId = item["CONTROLNO2"].ToString(), RequestBy = "scheduler", UserName = "scheduler", ProviderId = item["sSuperAgent"].ToString(), @@ -214,7 +225,9 @@ namespace JMETxnPushScheduler.Business Console.WriteLine("Release txn completed with response msg: " + result.Msg); if (result.ResponseCode == "0") { - _txnPush.UpdateTxnPost(item["ID"].ToString()); + // _txnPush.UpdateTxnPost(item["ID"].ToString()); + + _txnPush.UpdateTxnPostRelease(item["ID"].ToString()); } else { diff --git a/SendMail/Common/CommonResponse.cs b/SendMail/Common/CommonResponse.cs index 776e6e1..ee595fc 100644 --- a/SendMail/Common/CommonResponse.cs +++ b/SendMail/Common/CommonResponse.cs @@ -52,6 +52,7 @@ public class TFReleaseTxnRequest { public string TfPin { get; set; } + public string TxnId { get; set; } public string ProcessId { get; set; } public string UserName { get; set; } public string ProviderId { get; set; } diff --git a/SendMail/DAO/TxnPushDAO.cs b/SendMail/DAO/TxnPushDAO.cs index 8f49782..707db2c 100644 --- a/SendMail/DAO/TxnPushDAO.cs +++ b/SendMail/DAO/TxnPushDAO.cs @@ -20,15 +20,22 @@ namespace JMETxnPushScheduler.DAO return ExecuteDataTable(sql); } - public void UpdateTxnPost(string id, string pCurrCostRate = null ) + public void UpdateTxnPost(string id, string pCurrCostRate = null, string controlNo2 = null ) { string sql = "EXEC PROC_TP_TXN_PUSH @FLAG = 'UPDATE-POST'"; sql += ", @TRAN_ID = " + FilterString(id); + sql += ", @control2 = " + FilterString(controlNo2); sql += ", @pCurrCostRate = " + FilterString(pCurrCostRate); ExecuteDataTable(sql); } + public void UpdateTxnPostRelease(string id,string controlNo2 = null) + { + string sql = "EXEC PROC_TP_TXN_PUSH @FLAG = 'UPDATE-POST_RELEASE'"; + sql += ", @TRAN_ID = " + FilterString(id); + ExecuteDataTable(sql); + } public void UpdateTxnInstantPaid(string id) { string sql = "EXEC PROC_TP_TXN_PUSH @FLAG = 'INSTANT-PAID'"; diff --git a/SendMail/Program.cs b/SendMail/Program.cs index 1e4ab9c..9209171 100644 --- a/SendMail/Program.cs +++ b/SendMail/Program.cs @@ -11,7 +11,8 @@ namespace SendMail Console.WriteLine("Scheduler started on: " + DateTime.Now); TxnPush _txnPush = new TxnPush(); _txnPush.TxnSyncMain(); - // _txnPush.TxnReleaseMain(); + + _txnPush.TxnReleaseMain(); Console.WriteLine("Scheduler started on: " + DateTime.Now);