From a47b138c7455dee981af9b4fac431a16c0eee675 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 25 Dec 2025 18:04:42 +0800
Subject: [PATCH] 报名导出修改
---
admin/app/api/controller/branch/Activity.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/admin/app/api/controller/branch/Activity.php b/admin/app/api/controller/branch/Activity.php
index bc20541..9200299 100644
--- a/admin/app/api/controller/branch/Activity.php
+++ b/admin/app/api/controller/branch/Activity.php
@@ -63,7 +63,7 @@
$points = SettingModel::getItem('points');
$detail['points_ratio'] = $points['discount']['discount_ratio']; // 积分抵扣比例
// 获取报名用户列表
- $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 8);
+ $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 7);
return $this->renderSuccess('', compact('detail', 'userList'));
}
@@ -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'));
}
/**
--
Gitblit v1.9.2