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

修正APP的订单号解析

Browse Source
feature/pay
lyt 6 years ago
parent 686d94b287
commit 409f889cbc
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -783,8 +783,10 @@ class IPayLinksService extends CI_Controller
//APP订单处理，如标题China Train Booking-160617462 //APP订单处理，如标题China Train Booking-160617462
if ((strpos($note_invoice_string, 'China Train Booking') !== false) || (strpos($note_invoice_string, 'ChinaTrainBooking') !== false)) { if ((strpos($note_invoice_string, 'China Train Booking') !== false) || (strpos($note_invoice_string, 'ChinaTrainBooking') !== false)) {
$note_invoice_string = explode('-', $note_invoice_string); $note_invoice_string = explode('-', $note_invoice_string);
if (isset($note_invoice_string[1])) { if (isset($note_invoice_string[1]) && $note_invoice_string[1] !== "ChinaTrainBooking") {
$note_invoice_string = trim($note_invoice_string[1]); $note_invoice_string = trim($note_invoice_string[1]);
} elseif (isset($note_invoice_string[0]) && $note_invoice_string[0] !== "China Train Booking") {
$note_invoice_string = trim($note_invoice_string[0]);
} }
return json_encode(array('orderid' => $note_invoice_string, 'ordertype' => 'A')); //APP订单，不需要处理交易记录和通知 return json_encode(array('orderid' => $note_invoice_string, 'ordertype' => 'A')); //APP订单，不需要处理交易记录和通知
} }

4
webht/third_party/pay/helpers/payment_helper.php vendored
Unescape Escape View File

@ -106,8 +106,10 @@ function analysis_orderid($note_invoice_string) {
//APP订单处理，如标题China Train Booking-160617462 //APP订单处理，如标题China Train Booking-160617462
if ((strpos($note_invoice_string, 'China Train Booking') !== false) || (strpos($note_invoice_string, 'ChinaTrainBooking') !== false)) { if ((strpos($note_invoice_string, 'China Train Booking') !== false) || (strpos($note_invoice_string, 'ChinaTrainBooking') !== false)) {
$note_invoice_string = explode('-', $note_invoice_string); $note_invoice_string = explode('-', $note_invoice_string);
if (isset($note_invoice_string[1])) { if (isset($note_invoice_string[1]) && $note_invoice_string[1] !== "ChinaTrainBooking") {
$note_invoice_string = trim($note_invoice_string[1]); $note_invoice_string = trim($note_invoice_string[1]);
} elseif (isset($note_invoice_string[0]) && $note_invoice_string[0] !== "China Train Booking") {
$note_invoice_string = trim($note_invoice_string[0]);
} }
return json_encode(array('orderid' => $note_invoice_string, 'ordertype' => 'A')); //APP订单，不需要处理交易记录和通知 return json_encode(array('orderid' => $note_invoice_string, 'ordertype' => 'A')); //APP订单，不需要处理交易记录和通知
} }

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

@ -623,8 +623,10 @@ class Index extends CI_Controller {
//APP订单处理，如标题China Train Booking-160617462 //APP订单处理，如标题China Train Booking-160617462
if ((strpos($note_invoice_string, 'China Train Booking') !== false) || (strpos($note_invoice_string, 'ChinaTrainBooking') !== false)) { if ((strpos($note_invoice_string, 'China Train Booking') !== false) || (strpos($note_invoice_string, 'ChinaTrainBooking') !== false)) {
$note_invoice_string = explode('-', $note_invoice_string); $note_invoice_string = explode('-', $note_invoice_string);
if (isset($note_invoice_string[1])) { if (isset($note_invoice_string[1]) && $note_invoice_string[1] !== "ChinaTrainBooking") {
$note_invoice_string = trim($note_invoice_string[1]); $note_invoice_string = trim($note_invoice_string[1]);
} elseif (isset($note_invoice_string[0]) && $note_invoice_string[0] !== "China Train Booking") {
$note_invoice_string = trim($note_invoice_string[0]);
} }
return json_encode(array('orderid' => $note_invoice_string, 'ordertype' => 'A')); //APP订单，不需要处理交易记录和通知 return json_encode(array('orderid' => $note_invoice_string, 'ordertype' => 'A')); //APP订单，不需要处理交易记录和通知
} }
@ -927,7 +929,6 @@ class Index extends CI_Controller {
//根据订单号查找外联信息 //根据订单号查找外联信息
$advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick);
//查不到订单信息 //查不到订单信息
if (empty($advisor_info)) { if (empty($advisor_info)) {
$this->Note_model->update_send($item->pn_txn_id, 'sendfail'); $this->Note_model->update_send($item->pn_txn_id, 'sendfail');

Write Preview
Loading…
Cancel
Save