Merge remote-tracking branch 'origin/master'

app/api/model/Orders.php

@@ -5,7 +5,7 @@ namespace app\api\model;
 use app\common\library\DatabaseRoute;
 use app\common\model\BaseModel;
 use app\common\model\SysUser;
-use app\queue\ActivitiesQueue;
+use app\queue\redis\ActivitiesQueue;
 use app\utils\RedisUtils;
 use DateTime;
 use think\facade\Db;
@@ -199,13 +199,13 @@ class Orders extends BaseModel
 
 
             // TODO 异步领取奖励
-//            pushQueue(ActivitiesQueue::class, [
-//                'userInfo' => $userInfo,
-//                'sourceUser' => $byUser
-//            ], 1);
-            DatabaseRoute::transactionXa(function () use ($userInfo, $byUser, $userId) {
-                self::activities($userInfo, $byUser);
-            });
+            pushQueue(ActivitiesQueue::class, [
+                'userInfo' => $userInfo,
+                'sourceUser' => $byUser
+            ], 1);
+//            DatabaseRoute::transactionXa(function () use ($userInfo, $byUser, $userId) {
+//                self::activities($userInfo, $byUser);
+//            });
         }