From a4b3ee325c7354579d495bc74a777e494e5ec38c Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 06 Feb 2026 18:18:44 +0800
Subject: [PATCH] 商品可以价格面议 选择走访时显示输入走访企业名 分会添加活动时要总会审核 分类添加人数限制,添加活动选择了填写人数限制的分类时活动名额下显示该分类人数限制为15 同一个企业30天内只能走访一次,在30天内走访同一个企业时提示该企业已被走访xx天后才可以从新走访

---
 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