Merge branch 'feature/pay'

hotfix/远程访问多媒体中心
lyt 6 years ago
commit e070c0d781

@ -428,7 +428,9 @@ class PaymentService extends CI_Controller {
$data['order_info'] = $this->account_model->get_order($orderid_info->orderid, true, $orderid_info->ordertype);
if ($orderid_info->ordertype === 'T') {
$data['gai_info'] = $this->account_model->get_money_t($pn_txn_id);
} elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP') {
} elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP'
|| $orderid_info->ordertype === 'A'
) {
$data['gai_info'] = $this->account_model->get_money_b($pn_txn_id);
}
}
@ -463,7 +465,9 @@ class PaymentService extends CI_Controller {
$old_ssje = $data['gai_info'][0]->GAI_SSJE;
$this->account_model->delete_money_t($pn_txn_id);
}
} elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP') {
} elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP'
|| $orderid_info->ordertype === 'A'
) {
$data['gai_info'] = $this->account_model->get_money_b($pn_txn_id);
if ( ! empty($data['gai_info'])) {
$old_ssje = $data['gai_info'][0]->GAI_SSJE;

Loading…
Cancel
Save