From 64b15017de944b8f3e60713505fc3e83932767f0 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 28 May 2019 13:46:19 +0800
Subject: [PATCH] =?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);