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

Merge branch 'master' of https://gitee.com/hainatravel/information-system

Browse Source
hotfix/远程访问多媒体中心
赵鹏 6 years ago
parent 57874d7fb6 10c54e3e04
commit 35cb6f8477
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

@ -920,7 +920,7 @@ class Index extends CI_Controller {
$GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0;
//CHTAPP订单添加记录前判断是否有记录，以前的APP版本没有交易号，只能拿金额来判断
if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP' && strstr($advisor_info->COLI_WebCode, "-") !== '-biz') {//只判断前6位字符，CHTAPP-fr CHTAPP-jp等各语种都属于APP订单
$this->Paypal_model->add_account_info_forAPP($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_forAPP($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, $item->pn_payer_email, $item->pn_txn_id, $ht_memo);
if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { //只修改APP组的订单状态，并且订单进度是我的订单
$this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款
$this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'BS8');
@ -942,7 +942,7 @@ class Index extends CI_Controller {
$item->pn_payment_date,
$item->pn_payment_date,
$item->pn_payment_date,
'',
$item->pn_payer,
$item->pn_payer_email,
$item->pn_txn_id,
$ht_memo);

1
webht/third_party/paypal/models/note_model.php vendored
Unescape Escape View File

@ -57,6 +57,7 @@ class Note_model extends CI_Model {
$this->topnum=1;
$this->pn_txn_id=" AND pn.pn_txn_id=".$this->HT->escape($pn_txn_id);
$this->pn_txn_id .= ($pn_sn===NULL) ? "" : " AND pn.pn_sn=".$this->HT->escape($pn_sn);
$this->orderby=" ORDER BY pn_payment_date, pn_payer desc ";
return $this->get_list();
}

3
webht/third_party/trippestOrderSync/controllers/TulanduoApi.php vendored
Unescape Escape View File

@ -400,6 +400,9 @@ class TulanduoApi extends CI_Controller
if (intval($coli_opi_id) === 435 && in_array($gci_info->GCI_FromAgc, array("D目的地桂林组", "Trippest"))) {
$finance_memo .= "备注: 本订单组团社是渠道, 账单收款方应为地接社代收, 同步回来却是Trippest自营, 请注意核对.\r\n";
$new_memo .= mb_strstr($new_memo, "orderRemark", true)!==false ? $finance_memo : ("orderRemark " . $finance_memo);
} else if (intval($coli_opi_id) !== 435 && ! in_array($gci_info->GCI_FromAgc, array("D目的地桂林组", "Trippest"))) {
$finance_memo .= "备注: 本订单是自营团, 账单收款方应为海纳收款, 同步得到结果是桂林海纳分销渠道, 请注意核对.\r\n";
$new_memo .= mb_strstr($new_memo, "orderRemark", true)!==false ? $finance_memo : ("orderRemark " . $finance_memo);
}
// 团款总金额
// 渠道实收

Write Preview
Loading…
Cancel
Save