From 1435e9f97ef203418e48b5d80a36ec7f29b84377 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 28 May 2019 13:41:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?PayPal=20detail=E4=BC=98=E5=85=88IPN?= =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9E=9C>WH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/paypal/models/note_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index ac914479..109bad65 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -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(); } From 64b15017de944b8f3e60713505fc3e83932767f0 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 28 May 2019 13:46:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?PayPal=E6=94=B6=E6=AC=BE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E5=AE=A2=E4=BA=BA=E5=90=8D=E5=AD=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/paypal/controllers/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 33718108..46f2510f 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -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); From 736b5b6b04ba38f1866427fff2084844c2fb4fac Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 28 May 2019 14:12:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Trippest=E5=90=8C=E6=AD=A5:=E8=87=AA?= =?UTF-8?q?=E8=90=A5=E8=AE=A2=E5=8D=95=E6=94=B6=E6=AC=BE=E6=96=B9=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trippestOrderSync/controllers/TulanduoApi.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index ba83d1d4..dc30bcc4 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -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); } // 团款总金额 // 渠道实收