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/Activity.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/admin/app/api/controller/branch/Activity.php b/admin/app/api/controller/branch/Activity.php
index bc20541..9b16ab1 100644
--- a/admin/app/api/controller/branch/Activity.php
+++ b/admin/app/api/controller/branch/Activity.php
@@ -55,7 +55,7 @@
// 用户是否已报名
$detail['is_reg'] = ActivityUserModel::isReg($user['user_id'], $activity_id);
// 用户是否已加入分会
- $detail['is_member'] = MemberModel::isMember($user['user_id']);
+ $detail['is_member'] =/*MemberModel::isMember($user['user_id'])*/false;
// 用户是否已签到
$detail['is_verify'] = ActivityUserModel::isVerify($user['user_id'], $activity_id);
$store = SettingModel::getItem('store');
@@ -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