From 6e0b38b0ea6669d532e9d2279a81ca3963e0f3ad Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 13 Nov 2025 00:14:05 +0800
Subject: [PATCH] 1、小程序端列出所有报名人员名单(含姓名); 2、优化活动促销商品; 3、优化小程序端活动详情页; 4、优化后台连盟活动修改页面,并展示促销商品; 5、参与活动人员积分设置改到职务里添加。

---
 admin/app/api/model/branch/ActivityUser.php |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index 818d2ca..aa65b02 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']])
@@ -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