修改拼团

app/api/controller/GroupActivityController.php

@@ -32,7 +32,8 @@ class GroupActivityController extends BaseApiController
      */
     public function orderDetail(){
         $sn = $this->request->param('sn');
-        $result = GroupActivityLogic::orderDetail($sn,$this->request->domain());
+        $order_id = $this->request->param('order_id');
+        $result = GroupActivityLogic::orderDetail($sn,$order_id,$this->request->domain());
         return $this->data($result);
     }
 

app/api/logic/GroupActivityLogic.php

@@ -51,10 +51,13 @@ class GroupActivityLogic extends BaseLogic
     /**
      * @notes 拼团订单详情
      */
-    public static function orderDetail($sn,$url){
-        $detail = GroupOrder::where(['sn'=>$sn])->findOrEmpty()->toArray();
+    public static function orderDetail($sn,$order_id,$url){
+        if (empty($sn) && empty($order_id)) {
+            return [];
+        }
+        $where = $sn ? ['sn'=>$sn] : ['id'=>$order_id];
+        $detail = GroupOrder::where($where)->findOrEmpty()->toArray();
         if(!empty($detail)){
-           
             $detail['activity'] = GroupActivity::with('goods')->where(['id'=>$detail['group_activity_id']])->visible([
                 'id','title','image','start_time','end_time','type','equity_id',
                 'participant_num','origin_price','price','form_time_limit'
@@ -359,7 +362,7 @@ class GroupActivityLogic extends BaseLogic
             
             $scene_page = 'group';
             $response = (new WeChatMnpService())->getUnlimitedQRCode(
-                'page='.$scene_page.'&id='.$params['id'].'&sn='.$params['sn'],
+                'page='.$scene_page.'&id='.$params['id'].'&order_id='.$params['order_id'],
                 $mnp_page,
                 env('miniprogram.mini_env_version', 'release'),
                 false

app/api/validate/GroupOrderValidate.php

@@ -63,7 +63,7 @@ class GroupOrderValidate extends BaseValidate
 
     public function sceneQrcode()
     {
-        return $this->only(['id','sn']);
+        return $this->only(['id','order_id']);
     }
 
 }