Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商旅的收款记录, 美金金额写入GAI_Money, 所有支付方式

Browse Source
feature/pay
lyt 6 years ago
parent 409f889cbc
commit 236c318a95
4 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
webht/third_party/pay/controllers/iPayLinksService.php vendored
Unescape Escape View File

@ -445,6 +445,7 @@ class IPayLinksService extends CI_Controller
$currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->IPL_currencyCode))); $currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->IPL_currencyCode)));
$ssje = $this->IPayLinks_model->get_ssje($item->IPL_orderAmount, $currencyCode); $ssje = $this->IPayLinks_model->get_ssje($item->IPL_orderAmount, $currencyCode);
$ssje = $old_ssje===NULL ? $ssje : $old_ssje; $ssje = $old_ssje===NULL ? $ssje : $old_ssje;
$USD_amount = $this->IPayLinks_model->get_USD($item->IPL_orderAmount, $currencyCode);
//更新还没有填的客邮和交易号de收款记录（商务订单） //更新还没有填的客邮和交易号de收款记录（商务订单）
if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) { if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) {
$ht_memo = '交易号(自动录入):' . $item->IPL_dealId; $ht_memo = '交易号(自动录入):' . $item->IPL_dealId;
@ -483,6 +484,7 @@ class IPayLinksService extends CI_Controller
$item->IPL_orderAmount, $item->IPL_orderAmount,
$item->IPL_completeTime, $item->IPL_completeTime,
$currencyCode, $currencyCode,
$USD_amount,
$ssje, $ssje,
$item->IPL_completeTime, $item->IPL_completeTime,
$item->IPL_completeTime, $item->IPL_completeTime,

21
webht/third_party/pay/models/IPayLinks_model.php vendored
Unescape Escape View File

@ -181,7 +181,7 @@ class IPayLinks_model extends CI_Model {
} }
//添加收款记录(商务订单) //添加收款记录(商务订单)
public function add_account_info($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { public function add_account_info($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) {
//先判断是否有这条数据 //先判断是否有这条数据
$sql = " $sql = "
@ -197,6 +197,7 @@ class IPayLinks_model extends CI_Model {
,GAI_SQJE ,GAI_SQJE
,GAI_SQDate ,GAI_SQDate
,GAI_SQJECurrency ,GAI_SQJECurrency
,GAI_Money
,GAI_SSJE ,GAI_SSJE
,GAI_SSDate ,GAI_SSDate
,GAI_AccountDate ,GAI_AccountDate
@ -207,8 +208,8 @@ class IPayLinks_model extends CI_Model {
,GAI_Memo ,GAI_Memo
,GAI_State ,GAI_State
,DeleteFlag ,DeleteFlag
) VALUES (?,?,15018,?,?,?,?,?,?,?,N?,N?,?,?,0,0)"; ) VALUES (?,?,15018,?,?,?,?,?,?,?,?,N?,N?,?,?,0,0)";
$query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo));
$insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); $insertid = $this->HT->last_id('BIZ_GroupAccountInfo');
return $query; return $query;
} }
@ -459,4 +460,18 @@ class IPayLinks_model extends CI_Model {
)"; )";
return $this->HT->query($sql, array($order_id))->num_rows() > 0; return $this->HT->query($sql, array($order_id))->num_rows() > 0;
} }
/*!
* 调用数据库函数,转换为美金
*/
public function get_USD($amount, $currency='RMB')
{
$sql = "SELECT dbo.ConvertCurrencyToCurrency(?,?,?,?) as ssje";
$query = $this->HT->query($sql, array(1, mb_strtolower($currency), 'usd', $amount));
$result = $query->result();
if ( ! empty($result)) {
return $result[0]->ssje;
}
return 0;
}
} }

17
webht/third_party/paypal/controllers/index.php vendored
Unescape Escape View File

@ -832,6 +832,7 @@ class Index extends CI_Controller {
if (!empty($orderid_info)) { if (!empty($orderid_info)) {
$ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency));
$ssje = $old_ssje===NULL ? $ssje : $old_ssje; $ssje = $old_ssje===NULL ? $ssje : $old_ssje;
$USD_amount = $this->Paypal_model->get_USD($item->pn_mc_gross, $item->pn_mc_currency);
//更新还没有填的客邮和交易号de收款记录（商务订单） //更新还没有填的客邮和交易号de收款记录（商务订单）
if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) { if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) {
$ht_memo = '交易号(自动录入):' . $item->pn_txn_id; $ht_memo = '交易号(自动录入):' . $item->pn_txn_id;
@ -849,7 +850,21 @@ class Index extends CI_Controller {
$this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 13); $this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 13);
$this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'BS13'); $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'BS13');
} }
$this->Paypal_model->add_account_info($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo); $this->Paypal_model->add_account_info(
$GAI_COLI_SN,
$advisor_info->COLI_ID,
$item->pn_mc_gross,
$item->pn_payment_date,
mb_strtoupper($item->pn_mc_currency),
$USD_amount,
$ssje,
$item->pn_payment_date,
$item->pn_payment_date,
$item->pn_payment_date,
'',
$item->pn_payer_email,
$item->pn_txn_id,
$ht_memo);
// 更新订单主表付款方式,防止没访问thankyou-train.asp // 更新订单主表付款方式,防止没访问thankyou-train.asp
$this->Paypal_model->update_paymanner($GAI_COLI_SN, '15010'); $this->Paypal_model->update_paymanner($GAI_COLI_SN, '15010');
} }

20
webht/third_party/paypal/models/paypal_model.php vendored
Unescape Escape View File

@ -188,7 +188,7 @@ class Paypal_model extends CI_Model {
} }
//添加收款记录(商务订单) //添加收款记录(商务订单)
public function add_account_info($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { public function add_account_info($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) {
//先判断是否有这条数据 //先判断是否有这条数据
$sql = " $sql = "
@ -204,6 +204,7 @@ class Paypal_model extends CI_Model {
,GAI_SQJE ,GAI_SQJE
,GAI_SQDate ,GAI_SQDate
,GAI_SQJECurrency ,GAI_SQJECurrency
,GAI_Money
,GAI_SSJE ,GAI_SSJE
,GAI_SSDate ,GAI_SSDate
,GAI_AccountDate ,GAI_AccountDate
@ -214,8 +215,8 @@ class Paypal_model extends CI_Model {
,GAI_Memo ,GAI_Memo
,GAI_State ,GAI_State
,DeleteFlag ,DeleteFlag
) VALUES (?,?,15002,?,?,?,?,?,?,?,?,?,?,?,0,0)"; ) VALUES (?,?,15002,?,?,?,?,?,?,?,?,?,?,?,?,0,0)";
$query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo));
$insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); $insertid = $this->HT->last_id('BIZ_GroupAccountInfo');
return $query; return $query;
} }
@ -657,6 +658,19 @@ class Paypal_model extends CI_Model {
} }
} }
/*!
* 调用数据库函数,转换为美金
*/
public function get_USD($amount, $currency='RMB')
{
$sql = "SELECT dbo.ConvertCurrencyToCurrency(?,?,?,?) as ssje";
$query = $this->HT->query($sql, array(1, mb_strtolower($currency), 'usd', $amount));
$result = $query->result();
if ( ! empty($result)) {
return $result[0]->ssje;
}
return 0;
}
/*! /*!
* 查询财务系统中是否已导入该团的账单数据 * 查询财务系统中是否已导入该团的账单数据

Write Preview
Loading…
Cancel
Save