From a06156b1cb0757f556b9653b2a6fbd39abf15593 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 22 Apr 2019 10:27:50 +0800
Subject: [PATCH] =?UTF-8?q?paypal=20Trippest=E7=AB=99=E7=9A=84=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E8=87=AA=E5=8A=A8=E5=BD=95=E5=85=A5=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/paypal/controllers/index.php  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index e6ba1bd4..b844043f 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -986,22 +986,22 @@ class Index extends CI_Controller {
             return $this->Note_model->update_send($paypal_msg->pn_txn_id, 'sendfail');
         }
         //更新正确的订单信息到记录中，以这个为主
-        $this->Note_model->set_invoice($item->pn_txn_id, $ht_tp_order->COLI_ID . '_B');
-        $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency));
-        $ht_memo = '交易号(自动录入):' . $item->pn_txn_id;
+        $this->Note_model->set_invoice($paypal_msg->pn_txn_id, $ht_tp_order->COLI_ID . '_B');
+        $ssje = $this->Paypal_model->get_ssje($paypal_msg->pn_mc_gross, '15002', mb_strtoupper($paypal_msg->pn_mc_currency));
+        $ht_memo = '交易号(自动录入):' . $paypal_msg->pn_txn_id;
         $this->Paypal_model->add_account_info(
             $ht_tp_order->COLI_SN,
             $ht_tp_order->COLI_ID,
-            $item->pn_mc_gross,
-            $item->pn_payment_date,
-            mb_strtoupper($item->pn_mc_currency),
+            $paypal_msg->pn_mc_gross,
+            $paypal_msg->pn_payment_date,
+            mb_strtoupper($paypal_msg->pn_mc_currency),
             $ssje,
-            $item->pn_payment_date,
-            $item->pn_payment_date,
-            $item->pn_payment_date,
+            $paypal_msg->pn_payment_date,
+            $paypal_msg->pn_payment_date,
+            $paypal_msg->pn_payment_date,
             '',
-            $item->pn_payer_email,
-            $item->pn_txn_id,
+            $paypal_msg->pn_payer_email,
+            $paypal_msg->pn_txn_id,
             $ht_memo
         );