From e0d7cf49d27a54f3cfba36c136e38e48e2957a96 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 21 Oct 2025 14:54:45 +0800
Subject: [PATCH] =?UTF-8?q?OPN=20:=20=20=E4=BF=9D=E5=AD=98=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6,=20=E8=AE=B0=E5=BD=95=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8;=20=E8=B7=B3=E8=BF=87=E4=B8=8D=E6=98=AFwxpay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/PaymentService.php | 3 +++
 webht/third_party/paypal/models/paypal_model.php     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php
index 1d0b0e49..0f507d13 100644
--- a/webht/third_party/pay/controllers/PaymentService.php
+++ b/webht/third_party/pay/controllers/PaymentService.php
@@ -660,6 +660,9 @@ class PaymentService extends CI_Controller {
 
         $note = $this->note_model->get_note($pn_id);
         $data['note'] = $note[0];
+        if ($data['note']->OPN_accountMethod !== 15016) {
+            return;
+        }
         $orderid_info = analysis_orderid($data['note']->OPN_orderId);
         if (!empty($orderid_info)) {
             $orderid_info = json_decode($orderid_info);
diff --git a/webht/third_party/paypal/models/paypal_model.php b/webht/third_party/paypal/models/paypal_model.php
index 4b034b15..93fa4dd9 100644
--- a/webht/third_party/paypal/models/paypal_model.php
+++ b/webht/third_party/paypal/models/paypal_model.php
@@ -664,13 +664,13 @@ class Paypal_model extends CI_Model {
     /** 删除收款记录 */
     public function delete_money_t($deadId)
     {
-      $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?";
+      $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=?";
       $query = $this->HT->query($sql, array($deadId));
       return $query;
     }
     public function delete_money_b($deadId)
     {
-      $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?";
+      $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=?";
       $query = $this->HT->query($sql, array($deadId));
       return $query;
     }