From 35a828d42b5d436528ffc65cda8eedb978582d54 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 22 Nov 2019 16:15:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E8=AF=AD=E5=95=86=E5=8A=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=88=86=E9=85=8D=E7=9A=84=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E9=80=9A=E7=9F=A5=E5=8F=91=E6=97=A5=E8=AF=AD=E5=AE=A2?= =?UTF-8?q?=E6=9C=8D=E9=82=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 6 ++++++ webht/third_party/pay/controllers/PaymentService.php | 6 ++++++ webht/third_party/pay/controllers/iPayLinksService.php | 6 ++++++ webht/third_party/paypal/controllers/index.php | 7 ++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index 92ee309d..b854131d 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -493,6 +493,12 @@ class AlipayTradeService extends CI_Controller $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; //lussie@chinahighlights.net $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; //lussie + if ($opi_email==='' + && in_array(strtoupper($advisor_info->COLI_WebCode), array('CHTAPP-JA', 'JP')) + ) { + $opi_email = 'contact@arachina.com'; + $opi_firstname = 'contact@arachina.com'; + } //没有外联信息表示订单未分配 if (empty($opi_email) || empty($opi_firstname)) { $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail'); diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index 7b4abdb2..f7b37bd1 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -249,6 +249,12 @@ class PaymentService extends CI_Controller { // 邮件外联 $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; + if ($opi_email==='' + && in_array(strtoupper($advisor_info->COLI_WebCode), array('CHTAPP-JA', 'JP')) + ) { + $opi_email = 'contact@arachina.com'; + $opi_firstname = 'contact@arachina.com'; + } //没有外联信息表示订单未分配 if (empty($opi_email) || empty($opi_firstname)) { $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail'); diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index e75625dc..2a43b0c3 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -529,6 +529,12 @@ class IPayLinksService extends CI_Controller $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; //lussie@chinahighlights.net $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; //lussie + if ($opi_email==='' + && in_array(strtoupper($advisor_info->COLI_WebCode), array('CHTAPP-JA', 'JP')) + ) { + $opi_email = 'contact@arachina.com'; + $opi_firstname = 'contact@arachina.com'; + } //没有外联信息表示订单未分配 if (empty($opi_email) || empty($opi_firstname)) { $this->Note_model->update_send($item->IPL_dealId, 'sendfail'); diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 8336b238..646f01f0 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -981,7 +981,12 @@ class Index extends CI_Controller { $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; //lussie@chinahighlights.net $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; //lussie - + if ($opi_email==='' + && in_array(strtoupper($advisor_info->COLI_WebCode), array('CHTAPP-JA', 'JP')) + ) { + $opi_email = 'contact@arachina.com'; + $opi_firstname = 'contact@arachina.com'; + } //没有外联信息表示订单未分配 if (empty($opi_email) || empty($opi_firstname)) { $this->Note_model->update_send($item->pn_txn_id, 'sendfail', $item->pn_sn);