From 56a26bb25bbc16ee7d44786a41df51f91aa78087 Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Fri, 16 May 2025 17:37:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/PaymentController.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/api/controller/PaymentController.php b/app/api/controller/PaymentController.php
index 94a1173..a57e966 100644
--- a/app/api/controller/PaymentController.php
+++ b/app/api/controller/PaymentController.php
@@ -40,7 +40,7 @@ class PaymentController extends BaseApiController
 {
 
     public array $notNeedLogin = ['aliNotify', 'notifyMnp', 'notifyOa', 'notifyApp'];
-
+    private $client;
 
 
     /**
@@ -201,7 +201,7 @@ class PaymentController extends BaseApiController
     {
         $params = $this->request->get();
         if(!isset($params['from']) || !isset($params['order_id'])) {
-            return $this->_error('参数缺失');
+            return $this->fail('参数缺失');
         }
         if($params['from'] == 'order') {
             $order = Db::name('order')->where('id', $params['order_id'])->find();
@@ -209,24 +209,24 @@ class PaymentController extends BaseApiController
             $order = Db::name('recharge_order')->where('id', $params['order_id'])->find();
         }
 
-        $payModel = new Pay();
+        $payModel = new pay\Pay();
         $pay = $payModel->where(['status' => 1])->order('sort')->hidden(['config'])->select()->toArray();
 
         foreach ($pay as $k => &$item) {
             if ($item['code'] == 'wechat') {
                 $item['extra'] = '微信快捷支付';
-                $item['pay_way'] = Pay::WECHAT_PAY;
+                $item['pay_way'] = pay\Pay::WECHAT_PAY;
             }
 
             if ($item['code'] == 'balance') {
-                $user_money = Db::name('user')->where(['id' => $this->user_id])->value('user_money');
+                $user_money = Db::name('user')->where(['id' => $this->userId])->value('user_money');
                 $item['extra'] = '可用余额:'.$user_money;
-                $item['pay_way'] = Pay::BALANCE_PAY;
+                $item['pay_way'] = pay\Pay::BALANCE_PAY;
             }
 
             if ($item['code'] == 'alipay') {
                 $item['extra'] = '';
-                $item['pay_way'] = Pay::ALI_PAY;
+                $item['pay_way'] = pay\Pay::ALI_PAY;
             }
 
             if (in_array($this->client, [Client_::mnp, Client_::oa]) && $item['code'] == 'alipay') {
@@ -251,7 +251,7 @@ class PaymentController extends BaseApiController
             'order_amount' => $order['order_amount'],
             'cancel_time' => $cancelTime,
         ];
-        $this->_success('', $data);
+         return $this->success('', $data);
     }
 
 }
\ No newline at end of file