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/model/branch/ActivityUser.php | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index fe233e7..ed84fb3 100644
--- a/admin/app/api/model/branch/ActivityUser.php
+++ b/admin/app/api/model/branch/ActivityUser.php
@@ -39,7 +39,7 @@
public function getListForUser($user_id, $params = [])
{
// 构建查询规则
- $model = $this->alias('A')->with(['activity' => ['branch', 'image']])
+ $model = $this->alias('A')->with(['activity' => ['branch', 'image'],'branch'])
->join('branch_activity B', 'B.activity_id = A.activity_id')
->field('A.*')
->visible(['activity' => ['name', 'image' => ['file_path'], 'branch' => ['name']]])
@@ -65,6 +65,7 @@
{
// 构建查询规则
$model = $this->alias('auser')
+ ->with('branch')
->field('auser.*,user.nickName,auser.real_name,user.avatarUrl')
->join('user', 'user.user_id = auser.user_id')
->where('auser.is_delete', '=', 0)
@@ -130,6 +131,14 @@
'branch_id' => $params['branch_id']?:0,
'app_id' => self::$app_id,
];
+ $refereeUser=[];
+ if (!empty($params['recommend_name'])&&!empty($params['recommend_mobile'])){
+ $refereeUser=(new UserModel())->where(['real_name'=>$params['recommend_name'],'mobile'=>$params['recommend_mobile']])->find();
+ }
+
+ if ($refereeUser){
+ $data['referee_id']=$refereeUser['user_id'];
+ }
// 如果是帮朋友报名,把用户信息记录下来
if ($params['is_friend']) {
$data['real_name'] = $params['real_name'];
@@ -137,12 +146,13 @@
$data['company'] = $params['company'];
$data['is_friend'] = 1;
$data['reg_user_id'] = $user['user_id']; // 记录是谁帮注册的,因为核销的时候会把user_id改为实际报名人的
+ }else{
+ if ($refereeUser){
+ $user->editReferee(['user_id'=>$user['user_id'],'referee_id'=>$refereeUser['user_id']]);
+ }
+ $user->save(['real_name'=>$params['real_name'],'mobile'=>$params['mobile'],'branch_id'=>$params['branch_id']]);
}
$data['trade_no'] = $data['order_no'];
- $refereeUser=(new UserModel())->where(['real_name'=>$params['recommend_name'],'mobile'=>$params['recommend_mobile']])->find();
- if ($refereeUser){
- $data['referee_id']=$refereeUser['user_id'];
- }
$this->save($data);
// 如果不需要在线支付
if ($data['online_money'] == 0) {
@@ -253,6 +263,14 @@
$this->error = '报名未开始';
return false;
}
+ if(empty($params['real_name']) || empty($params['mobile'])){
+ $this->error = '请输入姓名和手机号';
+ return false;
+ }
+ if(empty($params['recommend_name']) || empty($params['recommend_mobile'])){
+ $this->error = '请输入推荐人姓名和手机号';
+ return false;
+ }
if ($activity["status_text"]["reg_status"] == 2){
$this->error = '报名已结束';
return false;
--
Gitblit v1.9.2