兼容修改

app/api/model/Orders.php

@@ -134,8 +134,7 @@ class Orders extends BaseModel
 
     public static function updateOrderStatus($payDetail, $order, $userId) {
         if ($payDetail['state'] == 1) {
-            // TODO 测试
-//            return;
+            return;
         }
 
         $userInfo = DatabaseRoute::getDb('tb_user', $userId, true)->find();
@@ -198,7 +197,6 @@ class Orders extends BaseModel
             }
 
 
-            // TODO 异步领取奖励
             pushQueue(ActivitiesQueue::class, [
                 'userInfo' => $userInfo,
                 'sourceUser' => $byUser
@@ -313,8 +311,8 @@ class Orders extends BaseModel
         $signCount = $commonModel->getByCodeToInt(913);
         Log::info("活动领取: 用户{$user['user_name']}, 上级{$sourceUser['user_name']}, 达标次数{$inviteAchievement['count']}");
         // 首次达标发放奖励
-//        if ($inviteAchievement['state'] == 0 && $inviteAchievement['count'] >= $signCount) {
-        if (true) {
+        if ($inviteAchievement['state'] == 0 && $inviteAchievement['count'] >= $signCount) {
+//        if (true) {
             Log::info('开始领取达标奖励');
             $amount = $commonModel->getByCode(912)['value'];
             // 记录资金明细

app/czg/app/controller/WuyouController.php

@@ -214,6 +214,7 @@ class WuyouController extends BaseController
                 Log::info("无忧支付回调，验签失败， 签名结果: {$sign}");
 //            return 'success';
             }
+            throw new SysException("1");
 
             if ($params['callbacks'] != 'CODE_SUCCESS') {
                 Log::info("无忧支付回调，支付失败");
@@ -244,9 +245,7 @@ class WuyouController extends BaseController
             $payDetail = $payDetails[0];
             if ($payDetail['state'] == 1) {
                 Log::info("无忧支付回调，重复回调");
-                // TODO 测试
-
-//            return 'success';
+            return 'success';
             }
 
             $order = DatabaseRoute::getDb('orders', $userId)->where([
@@ -261,9 +260,7 @@ class WuyouController extends BaseController
 
             if ($order['status'] != 0) {
                 Log::info("无忧支付回调，订单已支付");
-                // TODO 测试
-
-//            return '订单已支付';
+            return '订单已支付';
             }
 
             $payDetail['third_order_no'] = $params['order_sn'];

app/functions.php

@@ -1,6 +1,7 @@
 <?php
 // 应用公共文件
 
+use app\exception\SysException;
 use support\Log;
 use support\think\Cache;
 use Webman\RedisQueue\Client;
@@ -720,7 +721,7 @@ function debounce(string $key,int $waitMs = 20)
         cache($key, 1, $ttl); // 设置一个短暂缓存用于防抖
     }else{
 
-        throw new \app\exception\SysException("操作过于频繁，请稍后再试");
+        throw new SysException("操作过于频繁，请稍后再试");
     }
 }
 

config/exception.php

@@ -13,5 +13,5 @@
  */
 
 return [
-    '' => support\exception\Handler::class,
+    '' => support\MyExceptionHandle::class,
 ];

support/MyExceptionHandle.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * This file is part of webman.
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the MIT-LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @author    walkor<walkor@workerman.net>
+ * @copyright walkor<walkor@workerman.net>
+ * @link      http://www.workerman.net/
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+namespace support;
+
+use app\exception\SysException;
+use Throwable;
+use Webman\Exception\ExceptionHandler;
+use Webman\Exception\ExceptionHandlerInterface;
+use Webman\Http\Request;
+use Webman\Http\Response;
+use Webman\Exception\BusinessException;
+
+/**
+ * Class Handler
+ * @package support\exception
+ */
+class MyExceptionHandle extends ExceptionHandler implements ExceptionHandlerInterface
+{
+    public $dontReport = [
+        BusinessException::class,
+    ];
+
+    public function report(Throwable $exception)
+    {
+        Log::error("捕获到全局异常，异常信息: ".$exception->getMessage());
+        Log::error($exception->getTraceAsString());
+        parent::report($exception);
+    }
+
+    public function render(Request $request, Throwable $exception): Response
+    {
+        return json( [
+            'code' => -1,
+            'message'  => $exception->getMessage(),
+            'time' => time(),
+            'data' => [],
+        ]);
+
+    }
+
+}