From 70b4d2aa9e4231a81e913b7cc77451b70e8702a3 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 5 Jun 2024 21:08:17 +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    | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/FlyCube/Api/Controller/PayController.class.php b/FlyCube/Api/Controller/PayController.class.php
index c0c7643..3f12e03 100644
--- a/FlyCube/Api/Controller/PayController.class.php
+++ b/FlyCube/Api/Controller/PayController.class.php
@@ -14,19 +14,6 @@ class PayController extends PublicController
      */
     public function _initialize()
     {
-    }
-    /**
-     * @description: Yansongda pay类的参数
-     */
-    protected $config;
-    /**
-     * @description: 发起小程序支付
-     */
-    public function pay()
-    {
-        //父级构造函数
-        parent::_initialize();
-
         //初始化 pay类的参数
         $this->config = [
             'wechat' => [
@@ -54,6 +41,18 @@ class PayController extends PublicController
                 'connect_timeout' => 5.0,
             ],
         ];
+    }
+    /**
+     * @description: Yansongda pay类的参数
+     */
+    protected $config;
+    /**
+     * @description: 发起小程序支付
+     */
+    public function pay()
+    {
+        //父级构造函数
+        parent::_initialize();
 
         //获取订单信息
         $where['order_sn'] = $_REQUEST['order_sn'];
@@ -86,9 +85,8 @@ class PayController extends PublicController
     {
         $this->publish('demo1', 'start');
         // 实例化 Yansongda Pay
-        $pay = Pay::wechat($this->config);
-        $callBackData = $pay->callback();
-        $this->publish('demo', json_encode($callBackData));
+        $result = Pay::wechat($this->config)->callback();
+        $this->publish('demo', json_encode($result));
         // try {
         //     // 获取并验证回调数据
         //     $callBackData = $pay->callback();
@@ -106,6 +104,6 @@ class PayController extends PublicController
         // }
 
         // 返回成功响应给腾讯服务器，告知通知已处理
-        return $pay->success();
+        return Pay::wechat()->success();
     }
 }