From 99bc15d2aedd7fe81e5635ff4c58e0ce513465a9 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 24 Dec 2018 14:28:00 +0800
Subject: [PATCH] =?UTF-8?q?APP=E7=9A=84=E8=87=AA=E5=8A=A8=E5=87=BA?=
 =?UTF-8?q?=E7=A5=A8=E8=AE=A2=E5=8D=95=E5=8F=B7,=20=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/controllers/index.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index adf0ac0b..63d44159 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -751,7 +751,12 @@ class Index extends CI_Controller {
             }
 
 			//检测是否是APP订单,默认不处理
-            if ((strpos($item->pn_memo, 'China Train Booking') !== false) || (strpos($item->pn_memo, 'ChinaTrainBooking') !== false)) { //APP自动出票的订单不需要处理
+            if (
+                    ( (strpos($item->pn_memo, 'China Train Booking') !== false)
+                        || (strpos($item->pn_memo, 'ChinaTrainBooking') !== false)
+                    )
+                && empty($pn_txn_id)
+            ) { //APP自动出票的订单不需要处理
                 $this->Note_model->update_send($item->pn_txn_id, 'send');
                 continue;
             }
@@ -795,7 +800,7 @@ class Index extends CI_Controller {
             $this->Note_model->set_invoice($item->pn_txn_id, $orderid_info->orderid . '_' . $orderid_info->ordertype);
 
 			//检测是否是APP订单,默认不处理
-            if ($orderid_info->ordertype == 'A') { //APP自动出票的订单不需要处理
+            if ($orderid_info->ordertype == 'A' ) { //APP自动出票的订单不需要处理
                 $this->Note_model->update_send($item->pn_txn_id, 'send');
                 continue;
             }