admin/app/api/controller/branch/Activity.php
@@ -97,12 +97,13 @@
            return $this->renderSuccess('', compact('order_id'));
        }
    }
    public function getRegistrationInformation($user_id = 0)
    public function getRegistrationInformation($user_id = 0,$activity_id=0)
    {
        // 生成报名用户
        $model = new ActivityUserModel();
        $userId = $user_id!=0?$user_id:$this->getUser()['user_id'];
        $registrationInformation = $model->getRegistrationInformation($userId);
        $user=$this->getUser();
        $userId = $user_id!=0?$user_id:$user['user_id'];
        $registrationInformation = $model->getRegistrationInformation($userId,$activity_id);
        return $this->renderSuccess('', compact('registrationInformation'));
    }
    /**