Merge branch 'group_0313'

app/adminapi/logic/group_activity/GroupOrderLogic.php

@@ -15,9 +15,9 @@
 namespace app\adminapi\logic\group_activity;
 
 
+use think\facade\Queue;
 use app\common\logic\BaseLogic;
 use app\common\model\user\User;
-use app\common\command\addServiceWork;
 use app\common\model\equity\EquityConfig;
 use app\common\model\group_activity\GroupOrder;
 use app\common\model\group_activity\GroupActivity;
@@ -68,9 +68,8 @@ class GroupOrderLogic extends BaseLogic
             //$detail->work_status = 1;
             //$detail->save();
             // 异步调用 changeWorkStatus 方法
-            // Queue::push(\app\job\AddServiceWorkJob::class, ['id' => $params['id']]);
-            // $detail->work_status = 1;
-            // $detail->save();
+            Queue::push(\app\job\AddServiceWorkJob::class, ['id' => $params['id']]);
+            
         }
         return $detail->toArray();
     }

app/api/logic/GroupActivityLogic.php

@@ -225,7 +225,8 @@ class GroupActivityLogic extends BaseLogic
 
         return [
             'order_id' => (int)$userOrder['id'],
-            'sn' => $groupOrder['sn']
+            'sn' => $groupOrder['sn'],
+            'id' => (int)$groupOrder['id'],
         ];
     }
 
@@ -363,7 +364,7 @@ class GroupActivityLogic extends BaseLogic
     public static function getQRCode($params,$url)
     {
         try {
-            $mnp_page = 'pages/web_view/group';
+            $mnp_page = 'pages/group/orderSure';
             
             $scene_page = 'group';
             $response = (new WeChatMnpService())->getUnlimitedQRCode(

composer.json

@@ -25,6 +25,7 @@
         "topthink/think-orm": "^3.0",
         "topthink/think-multi-app": "^1.0",
         "topthink/think-view": "^2.0",
+        "topthink/think-queue": "^3.0",
         "dragonmantank/cron-expression": "^3.3",
         "qiniu/php-sdk": "7.4",
         "qcloud/cos-sdk-v5": "^2.5",