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/shop/model/branch/ActivityUser.php |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/admin/app/shop/model/branch/ActivityUser.php b/admin/app/shop/model/branch/ActivityUser.php
index 1b721d2..697f3b3 100644
--- a/admin/app/shop/model/branch/ActivityUser.php
+++ b/admin/app/shop/model/branch/ActivityUser.php
@@ -34,6 +34,7 @@
         $model = $this->alias('auser')
             ->field('auser.*, user.nickName, user.avatarUrl')
             ->join('user', 'user.user_id = auser.user_id')
+            ->with(['activity'=>['branch'],'branch'])
             ->where('auser.is_delete', '=', 0)
             ->order(['auser.create_time' => 'desc']);
         // 查询条件
@@ -43,6 +44,16 @@
         if (!empty($params['activity_id'])) {
             $model = $model->where('auser.activity_id', '=', $params['activity_id']);
         }
+        if (!empty($params['pay_status'])) {
+            if ($params['pay_status']>0){
+                $model = $model->where('auser.pay_status', '=', $params['pay_status']);
+            }
+        }
+        if (isset($params['status'])) {
+            if ($params['status']>-1) {
+                $model = $model->where('auser.status', '=', $params['status']);
+            }
+        }
         // 如果不分页
         if (!$is_page) {
             if ($limit) {

--
Gitblit v1.9.2