From f2266192898b339fe95a4e61c8266cfa071f2ea1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Sat, 12 Oct 2024 11:11:19 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20PayPal=E9=80=80=E6=AC=BE:=20=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E5=A4=84=E7=90=86IPN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/controllers/index.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index ab3cb2b2..abcc994c 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -1256,9 +1256,11 @@ class Index extends CI_Controller {
         if ( ! empty($notes) ) { // && strpos($notes[0]->pn_custom, 'GPA_') === false
             $memo0 = json_decode($notes[0]->pn_memo);
             if ( ! (isset($memo0->id) && substr($memo0->id, 0, 2)==="WH")) {
-                $IPN_note = $notes[0]; // 存在IPN, 本条忽略
-                $this->Note_model->update_send($item->pn_txn_id, 'send-', $item->pn_sn);
-                return false;
+                $IPN_note = $notes[0]; // 存在IPN, 本条WH忽略
+                if ((isset($payment_memo->id) && substr($payment_memo->id, 0, 2)==="WH")) {
+                    $this->Note_model->update_send($item->pn_txn_id, 'send-', $item->pn_sn);
+                    return false;
+                }
             }
         }
         // 找到原始收款交易的订单