From 6ce5e9d9b0ea4a857fa67b2605e8541f94455a77 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 5 Jun 2024 21:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0]=EF=BC=9A=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A?=
 =?UTF-8?q?=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09?=
 =?UTF-8?q?=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 .../Api/Controller/PayController.class.php    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/FlyCube/Api/Controller/PayController.class.php b/FlyCube/Api/Controller/PayController.class.php
index e62dfdd..01ad3d3 100644
--- a/FlyCube/Api/Controller/PayController.class.php
+++ b/FlyCube/Api/Controller/PayController.class.php
@@ -86,15 +86,20 @@ class PayController extends PublicController
         // 实例化 Yansongda Pay
         $result = Pay::wechat($this->config)->callback();
         $this->publish('demo', json_encode($result));
-        // 验证成功，处理业务逻辑
-        if ($result['trade_state'] == 'SUCCESS') {
-            $where['order_sn'] = $result['out_trade_no']; // 获取订单号
-            $orderDb = D('order'); // 实例化订单模型
-            $data['status'] = 'pending'; //付款状态
-            $data['pay_sn'] = $result['transaction_id']; //支付订单号
-            $orderDb->where($where)->data($data)->save(); //更改订单
+        try {
+            // 验证成功，处理业务逻辑
+            if ($result['resource']['ciphertext']['trade_state'] == 'SUCCESS') {
+                $where['order_sn'] = $result['resource']['ciphertext']['out_trade_no']; // 获取订单号
+                $orderDb = D('order'); // 实例化订单模型
+                $data['status'] = 'pending'; // 更新订单状态为已支付
+                $data['pay_sn'] = $result['resource']['ciphertext']['transaction_id']; // 支付订单号
+                // 更新订单
+                $orderDb->where($where)->data($data)->save();
+            }
+        } catch (\Exception $e) {
+            // 捕获并记录可能的异常
+            error_log('支付回调处理错误：' . $e->getMessage());
         }
-
         // 返回成功响应给腾讯服务器，告知通知已处理
         return Pay::wechat()->success();
     }