From 91a56a9b83ec23a1580aa586a24b34aba6990ffa Mon Sep 17 00:00:00 2001
From: lyzflash <lzhflash@163.com>
Date: Mon, 17 Nov 2025 14:58:42 +0800
Subject: [PATCH] 报名时可选择加入的分会
---
admin/app/api/model/branch/ActivityUser.php | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index 818d2ca..d0cc402 100644
--- a/admin/app/api/model/branch/ActivityUser.php
+++ b/admin/app/api/model/branch/ActivityUser.php
@@ -32,9 +32,9 @@
];
/**
- * 获取报名用户列表
+ * 获取用户报名的活动列表
*/
- public function getList($user_id, $params = [])
+ public function getListForUser($user_id, $params = [])
{
// 构建查询规则
$model = $this->alias('A')->with(['activity' => ['branch', 'image']])
@@ -139,7 +139,7 @@
{
$data = [
'user_id' => $user['user_id'],
- 'branch_id' => $activity['branch_id'],
+ 'branch_id' => $params['branch_id'],
'real_name' => $params['real_name'],
'mobile' => $params['mobile'],
'company' => $params['company'],
@@ -304,9 +304,14 @@
$detail->save($data);
// 发放奖励
$setting = BranchSettingModel::getItem('basic');
- if ($setting['participate_user'] > 0) {
+ $participate_points = $setting['participate_user'];
+ $member = MemberModel::detail($user['user_id'], ['position']);
+ if ($member && $member['position'] && $member['position']['participate_points'] > 0) {
+ $participate_points = $member['position']['participate_points'];
+ }
+ if ($participate_points > 0) {
$describe = "活动签到获得奖励[活动ID：{$activity_id}]";
- $user->setIncPoints($setting['participate_user'], $describe);
+ $user->setIncPoints($participate_points, $describe);
}
return true;
}
--
Gitblit v1.9.2