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/controller/branch/ActivityUser.php | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/admin/app/api/controller/branch/ActivityUser.php b/admin/app/api/controller/branch/ActivityUser.php
index 83e2062..9a5b58a 100644
--- a/admin/app/api/controller/branch/ActivityUser.php
+++ b/admin/app/api/controller/branch/ActivityUser.php
@@ -13,13 +13,24 @@
class ActivityUser extends Controller
{
/**
- * 活动报名列表
+ * 某活动报名的用户列表
*/
public function lists()
{
+ $model = new ActivityUserModel;
+ $list = $model->getListForActivity($this->postData(), true);
+ return $this->renderSuccess('', compact('list'));
+ }
+
+
+ /**
+ * 用户报名的活动列表
+ */
+ public function listsForUser()
+ {
$user = $this->getUser();
$model = new ActivityUserModel;
- $list = $model->getList($user['user_id'], $this->postData());
+ $list = $model->getListForUser($user['user_id'], $this->postData());
return $this->renderSuccess('', compact('list'));
}
@@ -56,9 +67,16 @@
{
$model = new ActivityUserModel;
$user = $this->getUser();
- if ($model->onVerify($user, $activity_id)) {
+ if ($model->onVerify($user, $activity_id, $this->postData())) {
return $this->renderSuccess('签到成功');
}
- return $this->renderError($model->getError() ?:'签到失败');
+ // 如果判断到没有报名。需要处理朋友帮报的情况
+ $error = $model->getError();
+ if ($error && $error == 'not_reg') {
+ return $this->renderSuccess('', [
+ 'result' => 'not_reg'
+ ]);
+ }
+ return $this->renderError($error ?:'签到失败');
}
}
\ No newline at end of file
--
Gitblit v1.9.2