From 776f0ed029de5a09a56e42fe736afb542ded127c Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Thu, 4 Dec 2025 11:19:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(addon):=20alipay=20=E5=8F=8A=20wechatpay=20?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=A4=E6=96=AD=E6=94=AF=E4=BB=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/addon/alipay/event/PayClose.php     | 20 ++++++++++----------
 src/addon/alipay/event/PayNotify.php    |  4 +++-
 src/addon/wechatpay/event/PayNotify.php | 12 ++++++------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/addon/alipay/event/PayClose.php b/src/addon/alipay/event/PayClose.php
index 2735871aa..0b35f0618 100644
--- a/src/addon/alipay/event/PayClose.php
+++ b/src/addon/alipay/event/PayClose.php
@@ -16,16 +16,16 @@ class PayClose
      */
     public function handle($params)
     {
-//        if ($params["pay_type"] == "alipay") {
-        try {
-            $pay_model = new PayModel($params[ 'site_id' ]);
-            $result = $pay_model->close($params);
-            return $result;
-        } catch (\Exception $e) {
-            return error(-1, $e->getMessage());
-        } catch (\Throwable $e) {
-            return error(-1, $e->getMessage());
+        if ($params["pay_type"] == "alipay") {
+            try {
+                $pay_model = new PayModel($params[ 'site_id' ]);
+                $result = $pay_model->close($params);
+                return $result;
+            } catch (\Exception $e) {
+                return error(-1, $e->getMessage());
+            } catch (\Throwable $e) {
+                return error(-1, $e->getMessage());
+            }
         }
-//        }
     }
 }
\ No newline at end of file
diff --git a/src/addon/alipay/event/PayNotify.php b/src/addon/alipay/event/PayNotify.php
index 43022db6b..097042930 100644
--- a/src/addon/alipay/event/PayNotify.php
+++ b/src/addon/alipay/event/PayNotify.php
@@ -13,8 +13,10 @@ class PayNotify
     /**
      * 支付方式及配置
      */
-    public function handle()
+    public function handle($param)
     {
+        if ($param[ "pay_type" ] != "alipay") return false;
+
         if (isset($_POST[ 'out_trade_no' ])) {
             $out_trade_no = $_POST[ 'out_trade_no' ];
             $pay = new PayCommon();
diff --git a/src/addon/wechatpay/event/PayNotify.php b/src/addon/wechatpay/event/PayNotify.php
index a180cdb60..5c10e01bd 100644
--- a/src/addon/wechatpay/event/PayNotify.php
+++ b/src/addon/wechatpay/event/PayNotify.php
@@ -15,11 +15,11 @@ class PayNotify
      */
     public function handle($param)
     {
-        if ($param[ "pay_type" ] == "wechatpay") {
-            $reqData = empty($GLOBALS[ 'HTTP_RAW_POST_DATA' ]) ? file_get_contents('php://input') : $GLOBALS[ 'HTTP_RAW_POST_DATA' ];
-            Log::write('微信支付回调数据');
-            Log::write($reqData);
-            return ( new PayModel() )->payNotify();            
-        }
+        if ($param[ "pay_type" ] != "wechatpay") return false;
+        
+        $reqData = empty($GLOBALS[ 'HTTP_RAW_POST_DATA' ]) ? file_get_contents('php://input') : $GLOBALS[ 'HTTP_RAW_POST_DATA' ];
+        Log::write('微信支付回调数据');
+        Log::write($reqData);
+        return ( new PayModel() )->payNotify(); 
     }
 }
\ No newline at end of file