From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/common/model/branch/ActivityUser.php | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/admin/app/common/model/branch/ActivityUser.php b/admin/app/common/model/branch/ActivityUser.php
index 1f0ae24..a930a81 100644
--- a/admin/app/common/model/branch/ActivityUser.php
+++ b/admin/app/common/model/branch/ActivityUser.php
@@ -43,6 +43,10 @@
{
return $this->belongsTo('app\\common\\model\\branch\\Activity', 'activity_id', 'activity_id');
}
+ public function branch()
+ {
+ return $this->belongsTo('app\\common\\model\\branch\\Branch', 'branch_id', 'branch_id');
+ }
/**
* 支付状态
@@ -184,13 +188,30 @@
//判断用户是否报名
public static function isReg($user_id, $activity_id)
{
- return !!(new static())->where('user_id', '=', $user_id)->where('status', '=', 1)->where('activity_id', '=', $activity_id)->count();
+ return !!(new static())->where('user_id', '=', $user_id)
+ ->where('status', '=', 1)
+ ->where('user_id <> reg_user_id')
+ ->where('activity_id', '=', $activity_id)
+ ->count();
+ }
+
+ //判断帮报的用户是否报名
+ public static function isRegByFriend($mobile, $activity_id)
+ {
+ return !!(new static())->where('mobile', '=', $mobile)
+ ->where('status', '=', 1)
+ ->where('is_friend', '=', 1)
+ ->where('activity_id', '=', $activity_id)
+ ->count();
}
//判断用户是否签到
public static function isVerify($user_id, $activity_id)
{
- return !!(new static())->where('user_id', '=', $user_id)->where('is_verify', '=', 1)->where('activity_id', '=', $activity_id)->count();
+ return !!(new static())->where('user_id', '=', $user_id)
+ ->where('is_verify', '=', 1)
+ ->where('activity_id', '=', $activity_id)
+ ->count();
}
/**
--
Gitblit v1.9.2