Wesmiler

.gitignore

@@ -2,6 +2,6 @@
 /bootstrap/compiled.php
 .env.*.php
 .env.php
-.env
+
 /vendor
 

app/Http/Controllers/Admin/MeetingController.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+
+use App\Services\Common\MeetingService;
+
+/**
+ * 会议
+ */
+class MeetingController extends Backend
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->service = new MeetingService();
+    }
+
+    /**
+     * 列表
+     */
+    public function index()
+    {
+        $params = request()->all();
+        $pageSize = isset($params['limit']) ? intval($params['limit']) : PERPAGE;
+        return $this->service->getDataList($params, $pageSize);
+    }
+
+    /**
+     * 编辑（处理投诉）
+     */
+    public function edit()
+    {
+        return $this->service->edit();
+    }
+
+    /**
+     * 删除
+     */
+    public function delete()
+    {
+        return $this->service->delete();
+    }
+
+    /**
+     * 修改状态
+     */
+    public function status()
+    {
+        return $this->service->status();
+    }
+
+    /**
+     * 获取详情
+     */
+    public function info()
+    {
+        $id = request()->get('id');
+        return $this->service->getInfo($id);
+    }
+}

app/Http/Controllers/Admin/MeetingRecordController.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Services\Common\ComplaintService;
+use App\Services\Common\MeetingService;
+
+/**
+ * 会议签到记录
+ */
+class MeetingRecordController extends Backend
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->service = new MeetingService();
+    }
+
+    /**
+     * 列表
+     */
+    public function index()
+    {
+        $params = request()->all();
+        $pageSize = isset($params['limit']) ? intval($params['limit']) : PERPAGE;
+        return $this->service->getDataList($params, $pageSize);
+    }
+
+    /**
+     * 编辑（处理投诉）
+     */
+    public function edit()
+    {
+        return $this->service->edit();
+    }
+
+    /**
+     * 删除
+     */
+    public function delete()
+    {
+        return $this->service->delete();
+    }
+
+    /**
+     * 修改状态
+     */
+    public function status()
+    {
+        return $this->service->status();
+    }
+
+    /**
+     * 获取详情
+     */
+    public function info()
+    {
+        $id = request()->get('id');
+        return $this->service->getInfo($id);
+    }
+}

app/Services/Common/MeetingRecordService.php

@@ -0,0 +1,594 @@
+<?php
+// +----------------------------------------------------------------------
+// | LARAVEL8.0 框架 [ LARAVEL ][ RXThinkCMF ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 LARAVEL研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: laravel开发员 <laravel.qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Services\Common;
+
+use App\Models\ActionLogModel;
+use App\Models\MeetingRecordsModel;
+use App\Models\MemberModel;
+use App\Services\BaseService;
+use App\Services\RedisService;
+
+/**
+ * 会议签到记录管理-服务类
+ * @author laravel开发员
+ * @since 2020/11/11
+ * @package App\Services\Common
+ */
+class MeetingRecordService extends BaseService
+{
+    public static $instance = null;
+
+    /**
+     * 构造函数
+     * @author laravel开发员
+     * @since 2020/11/11
+     */
+    public function __construct()
+    {
+        $this->model = new MeetingRecordsModel();
+    }
+
+    /**
+     * 静态入口
+     */
+    public static function make()
+    {
+        if (!self::$instance) {
+            self::$instance = new static();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * 获取列表
+     */
+    public function getList()
+    {
+        $params = request()->all();
+        $pageSize = $params['limit'] ?? 20;
+        $where = ['member.mark' => 1];
+        $status = isset($params['status']) ? $params['status'] : 0;
+        if ($status > 0) {
+            $where['member.status'] = $status;
+        }
+
+        $query = $this->model->with(['parent','account'])
+            ->from('member')
+            ->leftJoin('member as b','b.id','=','member.parent_id')
+            ->where($where)
+            ->where(function ($query) use ($params) {
+                $keyword = isset($params['keyword']) ? $params['keyword'] : '';
+                if ($keyword) {
+                    $query->where('member.nickname', 'like', "%{$keyword}%")->orWhere('member.realname', 'like', "%{$keyword}%");
+                }
+            })
+            ->where(function ($query) use ($params) {
+                $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
+                if ($mobile) {
+                    $query->where('member.mobile', 'like', "%{$mobile}%");
+                }
+
+                // 推荐人ID
+                $parentId = intval($params['parent_id']) ?? 0;
+                if ($parentId>0) {
+                    $query->where('member.parent_id', $parentId);
+                }
+
+                $parent = isset($params['parent']) ? trim($params['parent']) : '';
+                if (!empty($parent)) {
+                    $query->where(function ($q) use ($parent) {
+                        $q->where('b.nickname', 'like', "%{$parent}%")
+                            ->orWhere('b.realname', 'like', "%{$parent}%");
+                    });
+                }
+
+
+
+            })
+            ->select(['member.*'])
+            ->withCount(['invites'])
+            ->orderBy('member.create_time', 'desc')
+            ->orderBy('member.id', 'desc');
+        $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
+        $list = $list ? $list->toArray() : [];
+
+        if ($list) {
+            foreach ($list['data'] as &$item) {
+                $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
+                $item['balance'] = number_format($item['balance'], 2, '.', '');
+                $item['create_time_text'] = date('Y-m-d H:i:s', (int)$item['create_time']);
+                $item['login_time_text'] = $item['login_time'] ? date('Y-m-d H:i:s', (int)$item['login_time']) : '-';
+                $item['status_text'] = $item['status'] == 1 ? '正常' : '冻结';
+                $item['invites_count'] = $item['invites_count']?$item['invites_count']:0;
+            }
+        }
+
+        return [
+            'code' => 0,
+            'msg' => '获取成功',
+            'data' => isset($list['data'])?$list['data']:[],
+            'count' => isset($list['total'])?$list['total']:0
+        ];
+    }
+
+    /**
+     * 列表（兼容旧方法）
+     * @param $params
+     * @param int $pageSize
+     * @return array
+     */
+    public function getDataList($params, $pageSize = 15)
+    {
+        $where = ['a.mark' => 1];
+        $status = isset($params['status']) ? $params['status'] : 0;
+        if ($status > 0) {
+            $where['a.status'] = $status;
+        }
+
+        $query = $this->model->from('member as a')
+            ->where($where)
+            ->where(function ($query) use ($params) {
+                $keyword = isset($params['keyword']) ? $params['keyword'] : '';
+                if ($keyword) {
+                    $query->where('a.nickname', 'like', "%{$keyword}%")->orWhere('a.realname', 'like', "%{$keyword}%");
+                }
+            })
+            ->where(function ($query) use ($params) {
+                $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
+                if ($mobile) {
+                    $query->where('a.mobile', 'like', "%{$mobile}%");
+                }
+            })
+            ->select(['a.*']);
+
+        $query->orderBy('a.create_time', 'desc')->orderBy('a.id', 'desc');
+        $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
+        $list = $list ? $list->toArray() : [];
+        if ($list) {
+            foreach ($list['data'] as &$item) {
+                $item['nickname'] = trim($item['nickname']);
+                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H.i.s') : '';
+                $item['login_time'] = $item['login_time'] ? datetime($item['login_time'], 'Y-m-d H.i.s') : '';
+                $item['avatar'] = isset($item['avatar']) && $item['avatar'] ? get_image_url($item['avatar']) : '';
+            }
+        }
+
+        return [
+            'pageSize' => $pageSize,
+            'total' => isset($list['total']) ? $list['total'] : 0,
+            'list' => isset($list['data']) ? $list['data'] : []
+        ];
+    }
+
+
+    /**
+     * 按日期统计注册用户数
+     * @param $beginAt
+     * @param $endAt
+     * @param int $status
+     * @return mixed
+     */
+    public function getRegisterCount($beginAt = 0, $endAt = 0, $status = 0)
+    {
+        $cacheKey = "caches:members:count_{$beginAt}_{$endAt}_{$status}";
+        $data = RedisService::get($cacheKey);
+        if ($data) {
+            return $data;
+        }
+
+        $query = $this->model->where('mark', 1);
+        
+        // 如果指定了状态，添加状态筛选
+        if ($status > 0) {
+            $query->where('status', $status);
+        }
+        
+        // 时间范围筛选
+        if ($beginAt && $endAt) {
+            $query->whereBetween('create_time', [strtotime($beginAt), strtotime($endAt)]);
+        } else if ($beginAt) {
+            $query->where('create_time', '>=', strtotime($beginAt));
+        }
+        
+        $data = $query->count('id');
+        
+        if ($data) {
+            RedisService::set($cacheKey, $data, rand(300, 600));
+        }
+        
+        return $data;
+    }
+
+    /**
+     * 搜索用户（用于下拉选择）
+     * @param string $keyword 搜索关键词
+     * @param int $accountType 账户类型
+     * @param int $limit 返回数量
+     * @return array
+     */
+    public function searchUsers($keyword = '', $accountType = 1, $limit = 20)
+    {
+        try {
+            if ($accountType == 2) {
+                // 代理账户：以 agents 表为主
+                $query = \Illuminate\Support\Facades\DB::table('agents')
+                    ->where('mark', 1);
+
+                // 关键词搜索
+                if (!empty($keyword)) {
+                    $query->where(function ($q) use ($keyword) {
+                        $q->where('id', $keyword)
+                            ->orWhere('user_id', $keyword)
+                            ->orWhere('real_name', 'like', "%{$keyword}%")
+                            ->orWhere('phone', 'like', "%{$keyword}%");
+                    });
+                }
+
+                $list = $query->select([
+                    'user_id as id',
+                    'real_name as nickname',
+                    'real_name as realname',
+                    'phone as mobile',
+                    \Illuminate\Support\Facades\DB::raw('2 as user_type')
+                ])
+                    ->limit($limit)
+                    ->get()
+                    ->toArray();
+            } elseif ($accountType == 3) {
+                // 商户账户：以 stores 表为主
+                $query = \Illuminate\Support\Facades\DB::table('stores')
+                    ->where('mark', 1);
+
+                // 关键词搜索
+                if (!empty($keyword)) {
+                    $query->where(function ($q) use ($keyword) {
+                        $q->where('id', $keyword)
+                            ->orWhere('user_id', $keyword)
+                            ->orWhere('name', 'like', "%{$keyword}%")
+                            ->orWhere('real_name', 'like', "%{$keyword}%")
+                            ->orWhere('phone', 'like', "%{$keyword}%");
+                    });
+                }
+
+                $list = $query->select([
+                    'user_id as id',
+                    \Illuminate\Support\Facades\DB::raw('COALESCE(name, real_name) as nickname'),
+                    'real_name as realname',
+                    'phone as mobile',
+                    \Illuminate\Support\Facades\DB::raw('3 as user_type')
+                ])
+                    ->limit($limit)
+                    ->get()
+                    ->toArray();
+            } else {
+                // 会员账户：从 member 表查询
+                $query = MemberModel::where('mark', 1)
+                    ->whereIn('user_type', [0, 1]);
+
+                // 关键词搜索：昵称、手机号、ID
+                if (!empty($keyword)) {
+                    $query->where(function ($q) use ($keyword) {
+                        $q->where('id', $keyword)
+                            ->orWhere('nickname', 'like', "%{$keyword}%")
+                            ->orWhere('realname', 'like', "%{$keyword}%")
+                            ->orWhere('mobile', 'like', "%{$keyword}%");
+                    });
+                }
+
+                $list = $query->select(['id', 'nickname', 'realname', 'mobile', 'user_type'])
+                    ->limit($limit)
+                    ->get()
+                    ->toArray();
+            }
+
+            // 转换为数组（如果是对象）
+            $list = json_decode(json_encode($list), true);
+
+            return [
+                'code' => 0,
+                'msg' => '获取成功',
+                'data' => $list
+            ];
+        } catch (\Exception $e) {
+            return [
+                'code' => 1,
+                'msg' => '搜索失败：' . $e->getMessage(),
+                'data' => []
+            ];
+        }
+    }
+
+    /**
+     * 用户选项
+     * @return array
+     */
+    public function options()
+    {
+        // 获取参数
+        $param = request()->all();
+        // 用户ID
+        $keyword = getter($param, "keyword");
+        $parentId = getter($param, "parent_id");
+        $userId = getter($param, "user_id");
+        $datas = $this->model->where(function ($query) use ($parentId) {
+            if ($parentId) {
+                $query->where(['id' => $parentId, 'mark' => 1]);
+            } else {
+                $query->where(['status' => 1, 'mark' => 1]);
+            }
+        })
+            ->where(function ($query) use ($userId) {
+                if ($userId) {
+                    $query->whereNotIn('id', [$userId]);
+                }
+            })
+            ->where(function ($query) use ($keyword) {
+                if ($keyword) {
+                    $query->where('nickname', 'like', "%{$keyword}%")->orWhere('mobile', 'like', "%{$keyword}%");
+                }
+            })
+            ->select(['id', 'username', 'mobile', 'code', 'nickname', 'status'])
+            ->get();
+
+        return $datas ? $datas->toArray() : [];
+    }
+
+    /**
+     * 添加会编辑会员
+     * @return array
+     * @since 2020/11/11
+     * @author laravel开发员
+     */
+    public function edit()
+    {
+        // 请求参数
+        $data = request()->all();
+        $id = isset($data['id']) ? $data['id'] : 0;
+
+        // 查找会员
+        $member = MemberModel::where('id', $id)->where('mark', 1)->first();
+        if (!$member && $id) {
+            return message('会员不存在', false);
+        }
+
+        // 头像处理
+        if (isset($data['avatar']) && $data['avatar']) {
+            $data['avatar'] = get_image_path(trim($data['avatar']));
+        }
+
+        // 手机号唯一性验证
+        $mobile = isset($data['mobile']) ? trim($data['mobile']) : '';
+        if ($mobile) {
+            $checkId = $this->model->where(['mobile' => $mobile, 'mark' => 1])->value('id');
+            if ($checkId && ($id != $checkId)) {
+                return message('手机号已存在', false);
+            }
+        }
+
+        // 密码处理
+        if (isset($data['password']) && $data['password']) {
+            $data['password'] = get_password(trim($data['password']));
+        } else {
+            // 编辑时如果密码为空则不更新密码
+            unset($data['password']);
+        }
+
+        // 处理数值类型字段
+        if (isset($data['gender'])) {
+            $data['gender'] = (int)$data['gender'];
+        }
+        if (isset($data['user_type'])) {
+            $data['user_type'] = (int)$data['user_type'];
+        }
+        if (isset($data['member_level'])) {
+            $data['member_level'] = (int)$data['member_level'];
+        }
+        if (isset($data['balance'])) {
+            $data['balance'] = (float)$data['balance'];
+        }
+        if (isset($data['status'])) {
+            $data['status'] = (int)$data['status'];
+        }
+
+        // 设置日志
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => '修改会员信息', 'content' => json_encode($data, 256), 'module' => 'admin']);
+        ActionLogModel::record();
+
+        RedisService::keyDel("caches:members:count*");
+        RedisService::clear("caches:members:info_{$id}");
+        return parent::edit($data);
+    }
+
+    /**
+     * 审核
+     * @return array
+     * @since 2020/11/11
+     * @author laravel开发员
+     */
+    public function confirm()
+    {
+        // 请求参数
+        $data = request()->all();
+
+        $id = isset($data['id']) && $data['id'] ? $data['id'] : 0;
+        $drivingLicense = isset($data['driving_license']) ? $data['driving_license'] : '';
+        if ($drivingLicense) {
+            $data['driving_license'] = get_image_path($drivingLicense);
+        }
+
+        $driversLicense = isset($data['drivers_license']) ? $data['drivers_license'] : '';
+        if ($driversLicense) {
+            $data['drivers_license'] = get_image_path($driversLicense);
+        }
+
+        // 设置日志
+        $mobile = isset($data['mobile']) ? $data['mobile'] : '';
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "审核司机[{$mobile}]信息", 'content' => json_encode($data, 256), 'module' => 'admin']);
+        ActionLogModel::record();
+
+        RedisService::keyDel("caches:members:count*");
+        RedisService::clear("caches:members:info_{$id}");
+        return parent::edit($data); // TODO: Change the autogenerated stub
+    }
+
+    /**
+     * 获取详情
+     */
+    public function getInfo($id = null)
+    {
+        if ($id === null) {
+            $id = request()->input('id');
+        }
+
+        $info = MemberModel::where('id', $id)
+            ->where('mark', 1)
+            ->first();
+
+        if (!$info) {
+            return ['code' => 1, 'msg' => '记录不存在'];
+        }
+
+        $info = $info->toArray();
+        $info['avatar'] = $info['avatar'] ? get_image_url($info['avatar']) : '';
+        $info['balance'] = number_format($info['balance'], 2, '.', '');
+        $info['create_time_text'] = date('Y-m-d H:i:s', (int)$info['create_time']);
+        $info['login_time_text'] = $info['login_time'] ? date('Y-m-d H:i:s', (int)$info['login_time']) : '-';
+
+        return [
+            'code' => 0,
+            'msg' => '获取成功',
+            'data' => $info
+        ];
+    }
+
+    /**
+     * 添加会员
+     */
+    public function add()
+    {
+        $params = request()->all();
+
+        // 检查手机号是否已存在
+        $mobile = $params['mobile'] ?? '';
+        $exists = MemberModel::where('mobile', $mobile)
+            ->where('mark', 1)
+            ->exists();
+
+        if ($exists) {
+            return ['code' => 1, 'msg' => '手机号已存在'];
+        }
+
+        // 处理头像
+        $avatar = $params['avatar'] ?? '';
+        if ($avatar) {
+            $params['avatar'] = get_image_path($avatar);
+        }
+
+        // 处理密码
+        if (isset($params['password']) && $params['password']) {
+            $params['password'] = get_password($params['password']);
+        }
+
+        $data = [
+            'openid' => $params['openid'] ?? '',
+            'mobile' => $mobile,
+            'user_type' => (int)($params['user_type'] ?? 1),
+            'password' => $params['password'] ?? '',
+            'member_level' => (int)($params['member_level'] ?? 0),
+            'realname' => $params['realname'] ?? '',
+            'nickname' => $params['nickname'] ?? '',
+            'gender' => (int)($params['gender'] ?? 3),
+            'avatar' => $params['avatar'] ?? '',
+            'balance' => (float)($params['balance'] ?? 0),
+            'parent_id' => (int)($params['parent_id'] ?? 0),
+            'status' => (int)($params['status'] ?? 1),
+            'source' => (int)($params['source'] ?? 2),
+            'create_time' => time(),
+            'update_time' => time(),
+            'mark' => 1
+        ];
+
+        $result = MemberModel::insert($data);
+
+        if ($result) {
+            RedisService::keyDel("caches:members:count*");
+            return ['code' => 0, 'msg' => '添加成功'];
+        }
+
+        return ['code' => 1, 'msg' => '添加失败'];
+    }
+
+    /**
+     * 设置状态
+     */
+    public function status()
+    {
+        $params = request()->all();
+        $id = $params['id'] ?? 0;
+        $status = $params['status'] ?? 1;
+
+        $member = MemberModel::where('id', $id)
+            ->where('mark', 1)
+            ->first();
+
+        if (!$member) {
+            return ['code' => 1, 'msg' => '记录不存在'];
+        }
+
+        $member->status = $status;
+        $member->update_time = time();
+        $member->save();
+
+        RedisService::clear("caches:members:info_{$id}");
+        return ['code' => 0, 'msg' => '设置成功'];
+    }
+
+    /**
+     * 删除
+     * @return array
+     */
+    public function delete()
+    {
+        $id = request()->input('id');
+
+        if (is_array($id)) {
+            // 批量删除
+            $count = MemberModel::whereIn('id', $id)
+                ->where('mark', 1)
+                ->update(['mark' => 0, 'update_time' => time()]);
+
+            foreach ($id as $memberId) {
+                RedisService::clear("caches:members:info_{$memberId}");
+            }
+
+            RedisService::keyDel("caches:members:count*");
+            return ['code' => 0, 'msg' => "成功删除{$count}条记录"];
+        } else {
+            // 单个删除
+            $member = MemberModel::where('id', $id)
+                ->where('mark', 1)
+                ->first();
+
+            if (!$member) {
+                return ['code' => 1, 'msg' => '记录不存在'];
+            }
+
+            $member->mark = 0;
+            $member->update_time = time();
+            $member->save();
+
+            RedisService::clear("caches:members:info_{$id}");
+            RedisService::keyDel("caches:members:count*");
+            return ['code' => 0, 'msg' => '删除成功'];
+        }
+    }
+}

app/Services/Common/MeetingService.php

@@ -61,288 +61,92 @@ class MeetingService extends BaseService
             $where['member.status'] = $status;
         }
 
-        $query = $this->model->with(['parent','account'])
-            ->from('member')
-            ->leftJoin('member as b','b.id','=','member.parent_id')
+        $query = $this->model->with(['parent', 'account'])
+            ->from('meetings')
+            ->leftJoin('member', 'b.id', '=', 'meetings.user_id')
             ->where($where)
             ->where(function ($query) use ($params) {
                 $keyword = isset($params['keyword']) ? $params['keyword'] : '';
                 if ($keyword) {
-                    $query->where('member.nickname', 'like', "%{$keyword}%")->orWhere('member.realname', 'like', "%{$keyword}%");
+                    $query->where('member.nickname', 'like', "%{$keyword}%")->orWhere('member.mobile', 'like', "%{$keyword}%");
                 }
             })
-            ->where(function ($query) use ($params) {
-                $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
-                if ($mobile) {
-                    $query->where('member.mobile', 'like', "%{$mobile}%");
-                }
-
-                // 推荐人ID
-                $parentId = intval($params['parent_id']) ?? 0;
-                if ($parentId>0) {
-                    $query->where('member.parent_id', $parentId);
-                }
-
-                $parent = isset($params['parent']) ? trim($params['parent']) : '';
-                if (!empty($parent)) {
-                    $query->where(function ($q) use ($parent) {
-                        $q->where('b.nickname', 'like', "%{$parent}%")
-                            ->orWhere('b.realname', 'like', "%{$parent}%");
-                    });
-                }
-
-
-
-            })
-            ->select(['member.*'])
-            ->withCount(['invites'])
-            ->orderBy('member.create_time', 'desc')
-            ->orderBy('member.id', 'desc');
+            ->select(['meetings.*'])
+            ->withCount(['records'])
+            ->orderBy('meetings.sort', 'desc')
+            ->orderBy('meetings.id', 'desc');
         $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list ? $list->toArray() : [];
 
         if ($list) {
             foreach ($list['data'] as &$item) {
-                $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
-                $item['balance'] = number_format($item['balance'], 2, '.', '');
+                $item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
                 $item['create_time_text'] = date('Y-m-d H:i:s', (int)$item['create_time']);
-                $item['login_time_text'] = $item['login_time'] ? date('Y-m-d H:i:s', (int)$item['login_time']) : '-';
-                $item['status_text'] = $item['status'] == 1 ? '正常' : '冻结';
-                $item['invites_count'] = $item['invites_count']?$item['invites_count']:0;
             }
         }
 
         return [
             'code' => 0,
             'msg' => '获取成功',
-            'data' => isset($list['data'])?$list['data']:[],
-            'count' => isset($list['total'])?$list['total']:0
+            'data' => isset($list['data']) ? $list['data'] : [],
+            'count' => isset($list['total']) ? $list['total'] : 0
         ];
     }
 
     /**
-     * 列表（兼容旧方法）
-     * @param $params
-     * @param int $pageSize
-     * @return array
+     * 获取数据列表
+     * @param array $params 请求参数
+     * @param int $pageSize 分页大小
      */
     public function getDataList($params, $pageSize = 15)
     {
-        $where = ['a.mark' => 1];
-        $status = isset($params['status']) ? $params['status'] : 0;
-        if ($status > 0) {
-            $where['a.status'] = $status;
-        }
-
-        $query = $this->model->from('member as a')
-            ->where($where)
-            ->where(function ($query) use ($params) {
-                $keyword = isset($params['keyword']) ? $params['keyword'] : '';
-                if ($keyword) {
-                    $query->where('a.nickname', 'like', "%{$keyword}%")->orWhere('a.realname', 'like', "%{$keyword}%");
-                }
-            })
-            ->where(function ($query) use ($params) {
-                $mobile = isset($params['mobile']) ? trim($params['mobile']) : '';
-                if ($mobile) {
-                    $query->where('a.mobile', 'like', "%{$mobile}%");
-                }
-            })
-            ->select(['a.*']);
+        try {
+            $query = $this->model->where('mark', 1);
 
-        $query->orderBy('a.create_time', 'desc')->orderBy('a.id', 'desc');
-        $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
-        $list = $list ? $list->toArray() : [];
-        if ($list) {
-            foreach ($list['data'] as &$item) {
-                $item['nickname'] = trim($item['nickname']);
-                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H.i.s') : '';
-                $item['login_time'] = $item['login_time'] ? datetime($item['login_time'], 'Y-m-d H.i.s') : '';
-                $item['avatar'] = isset($item['avatar']) && $item['avatar'] ? get_image_url($item['avatar']) : '';
+            // 状态筛选
+            if (isset($params['status']) && $params['status'] !== '') {
+                $query->where('status', $params['status']);
             }
-        }
-
-        return [
-            'pageSize' => $pageSize,
-            'total' => isset($list['total']) ? $list['total'] : 0,
-            'list' => isset($list['data']) ? $list['data'] : []
-        ];
-    }
 
+            // 关键词搜索
+            if (isset($params['keyword']) && $params['keyword']) {
+                $keyword = $params['keyword'];
+                $query->where(function ($q) use ($keyword) {
+                    $q->where('title', 'like', '%' . $keyword . '%');
+                });
+            }
 
-    /**
-     * 按日期统计注册用户数
-     * @param $beginAt
-     * @param $endAt
-     * @param int $status
-     * @return mixed
-     */
-    public function getRegisterCount($beginAt = 0, $endAt = 0, $status = 0)
-    {
-        $cacheKey = "caches:members:count_{$beginAt}_{$endAt}_{$status}";
-        $data = RedisService::get($cacheKey);
-        if ($data) {
-            return $data;
-        }
+            $list = $query->with(['member'])
+                ->orderBy('sort', 'desc')
+                ->orderBy('id', 'desc')
+                ->paginate($pageSize);
 
-        $query = $this->model->where('mark', 1);
-        
-        // 如果指定了状态，添加状态筛选
-        if ($status > 0) {
-            $query->where('status', $status);
-        }
-        
-        // 时间范围筛选
-        if ($beginAt && $endAt) {
-            $query->whereBetween('create_time', [strtotime($beginAt), strtotime($endAt)]);
-        } else if ($beginAt) {
-            $query->where('create_time', '>=', strtotime($beginAt));
-        }
-        
-        $data = $query->count('id');
-        
-        if ($data) {
-            RedisService::set($cacheKey, $data, rand(300, 600));
-        }
-        
-        return $data;
-    }
+            $list = $list ? $list->toArray() : [];
 
-    /**
-     * 搜索用户（用于下拉选择）
-     * @param string $keyword 搜索关键词
-     * @param int $accountType 账户类型
-     * @param int $limit 返回数量
-     * @return array
-     */
-    public function searchUsers($keyword = '', $accountType = 1, $limit = 20)
-    {
-        try {
-            if ($accountType == 2) {
-                // 代理账户：以 agents 表为主
-                $query = \Illuminate\Support\Facades\DB::table('agents')
-                    ->where('mark', 1);
-
-                // 关键词搜索
-                if (!empty($keyword)) {
-                    $query->where(function ($q) use ($keyword) {
-                        $q->where('id', $keyword)
-                            ->orWhere('user_id', $keyword)
-                            ->orWhere('real_name', 'like', "%{$keyword}%")
-                            ->orWhere('phone', 'like', "%{$keyword}%");
-                    });
-                }
-
-                $list = $query->select([
-                    'user_id as id',
-                    'real_name as nickname',
-                    'real_name as realname',
-                    'phone as mobile',
-                    \Illuminate\Support\Facades\DB::raw('2 as user_type')
-                ])
-                    ->limit($limit)
-                    ->get()
-                    ->toArray();
-            } elseif ($accountType == 3) {
-                // 商户账户：以 stores 表为主
-                $query = \Illuminate\Support\Facades\DB::table('stores')
-                    ->where('mark', 1);
-
-                // 关键词搜索
-                if (!empty($keyword)) {
-                    $query->where(function ($q) use ($keyword) {
-                        $q->where('id', $keyword)
-                            ->orWhere('user_id', $keyword)
-                            ->orWhere('name', 'like', "%{$keyword}%")
-                            ->orWhere('real_name', 'like', "%{$keyword}%")
-                            ->orWhere('phone', 'like', "%{$keyword}%");
-                    });
+            if ($list && isset($list['data'])) {
+                foreach ($list['data'] as &$item) {
+                    $item['create_time'] = $item['create_time'] ? date('Y-m-d H:i:s', $item['create_time']) : '';
+                    $item['update_time'] = $item['update_time'] ? date('Y-m-d H:i:s', $item['update_time']) : '';
                 }
-
-                $list = $query->select([
-                    'user_id as id',
-                    \Illuminate\Support\Facades\DB::raw('COALESCE(name, real_name) as nickname'),
-                    'real_name as realname',
-                    'phone as mobile',
-                    \Illuminate\Support\Facades\DB::raw('3 as user_type')
-                ])
-                    ->limit($limit)
-                    ->get()
-                    ->toArray();
-            } else {
-                // 会员账户：从 member 表查询
-                $query = MemberModel::where('mark', 1)
-                    ->whereIn('user_type', [0, 1]);
-
-                // 关键词搜索：昵称、手机号、ID
-                if (!empty($keyword)) {
-                    $query->where(function ($q) use ($keyword) {
-                        $q->where('id', $keyword)
-                            ->orWhere('nickname', 'like', "%{$keyword}%")
-                            ->orWhere('realname', 'like', "%{$keyword}%")
-                            ->orWhere('mobile', 'like', "%{$keyword}%");
-                    });
-                }
-
-                $list = $query->select(['id', 'nickname', 'realname', 'mobile', 'user_type'])
-                    ->limit($limit)
-                    ->get()
-                    ->toArray();
             }
 
-            // 转换为数组（如果是对象）
-            $list = json_decode(json_encode($list), true);
-
             return [
+                'msg' => '操作成功',
                 'code' => 0,
-                'msg' => '获取成功',
-                'data' => $list
+                'data' => $list['data'] ?? [],
+                'count' => $list['total'] ?? 0,
             ];
         } catch (\Exception $e) {
             return [
+                'msg' => '查询失败: ' . $e->getMessage(),
                 'code' => 1,
-                'msg' => '搜索失败：' . $e->getMessage(),
-                'data' => []
+                'data' => [],
+                'count' => 0,
             ];
         }
     }
 
     /**
-     * 用户选项
-     * @return array
-     */
-    public function options()
-    {
-        // 获取参数
-        $param = request()->all();
-        // 用户ID
-        $keyword = getter($param, "keyword");
-        $parentId = getter($param, "parent_id");
-        $userId = getter($param, "user_id");
-        $datas = $this->model->where(function ($query) use ($parentId) {
-            if ($parentId) {
-                $query->where(['id' => $parentId, 'mark' => 1]);
-            } else {
-                $query->where(['status' => 1, 'mark' => 1]);
-            }
-        })
-            ->where(function ($query) use ($userId) {
-                if ($userId) {
-                    $query->whereNotIn('id', [$userId]);
-                }
-            })
-            ->where(function ($query) use ($keyword) {
-                if ($keyword) {
-                    $query->where('nickname', 'like', "%{$keyword}%")->orWhere('mobile', 'like', "%{$keyword}%");
-                }
-            })
-            ->select(['id', 'username', 'mobile', 'code', 'nickname', 'status'])
-            ->get();
-
-        return $datas ? $datas->toArray() : [];
-    }
-
-    /**
      * 添加会编辑会员
      * @return array
      * @since 2020/11/11
@@ -354,91 +158,20 @@ class MeetingService extends BaseService
         $data = request()->all();
         $id = isset($data['id']) ? $data['id'] : 0;
 
-        // 查找会员
-        $member = MemberModel::where('id', $id)->where('mark', 1)->first();
-        if (!$member && $id) {
-            return message('会员不存在', false);
-        }
-
-        // 头像处理
-        if (isset($data['avatar']) && $data['avatar']) {
-            $data['avatar'] = get_image_path(trim($data['avatar']));
-        }
-
-        // 手机号唯一性验证
-        $mobile = isset($data['mobile']) ? trim($data['mobile']) : '';
-        if ($mobile) {
-            $checkId = $this->model->where(['mobile' => $mobile, 'mark' => 1])->value('id');
-            if ($checkId && ($id != $checkId)) {
-                return message('手机号已存在', false);
-            }
-        }
-
-        // 密码处理
-        if (isset($data['password']) && $data['password']) {
-            $data['password'] = get_password(trim($data['password']));
-        } else {
-            // 编辑时如果密码为空则不更新密码
-            unset($data['password']);
-        }
-
-        // 处理数值类型字段
-        if (isset($data['gender'])) {
-            $data['gender'] = (int)$data['gender'];
-        }
-        if (isset($data['user_type'])) {
-            $data['user_type'] = (int)$data['user_type'];
-        }
-        if (isset($data['member_level'])) {
-            $data['member_level'] = (int)$data['member_level'];
-        }
-        if (isset($data['balance'])) {
-            $data['balance'] = (float)$data['balance'];
-        }
-        if (isset($data['status'])) {
-            $data['status'] = (int)$data['status'];
+        // 封面
+        if (isset($data['thumb']) && $data['thumb']) {
+            $data['thumb'] = get_image_path(trim($data['thumb']));
         }
 
         // 设置日志
-        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => '修改会员信息', 'content' => json_encode($data, 256), 'module' => 'admin']);
+        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => '编辑会议信息', 'content' => json_encode($data, 256), 'module' => 'admin']);
         ActionLogModel::record();
 
-        RedisService::keyDel("caches:members:count*");
-        RedisService::clear("caches:members:info_{$id}");
+        RedisService::keyDel("caches:meetings:count*");
+        RedisService::keyDel("caches:meetings:info_{$id}*");
         return parent::edit($data);
     }
 
-    /**
-     * 审核
-     * @return array
-     * @since 2020/11/11
-     * @author laravel开发员
-     */
-    public function confirm()
-    {
-        // 请求参数
-        $data = request()->all();
-
-        $id = isset($data['id']) && $data['id'] ? $data['id'] : 0;
-        $drivingLicense = isset($data['driving_license']) ? $data['driving_license'] : '';
-        if ($drivingLicense) {
-            $data['driving_license'] = get_image_path($drivingLicense);
-        }
-
-        $driversLicense = isset($data['drivers_license']) ? $data['drivers_license'] : '';
-        if ($driversLicense) {
-            $data['drivers_license'] = get_image_path($driversLicense);
-        }
-
-        // 设置日志
-        $mobile = isset($data['mobile']) ? $data['mobile'] : '';
-        ActionLogModel::setRecord(session('userId'), ['type' => 1, 'title' => "审核司机[{$mobile}]信息", 'content' => json_encode($data, 256), 'module' => 'admin']);
-        ActionLogModel::record();
-
-        RedisService::keyDel("caches:members:count*");
-        RedisService::clear("caches:members:info_{$id}");
-        return parent::edit($data); // TODO: Change the autogenerated stub
-    }
 
     /**
      * 获取详情
@@ -449,20 +182,17 @@ class MeetingService extends BaseService
             $id = request()->input('id');
         }
 
-        $info = MemberModel::where('id', $id)
+        $info = MeetingModel::where('id', $id)
             ->where('mark', 1)
             ->first();
 
         if (!$info) {
-            return ['code' => 1, 'msg' => '记录不存在'];
+            return ['code' => 1, 'msg' => '会议不存在'];
         }
 
         $info = $info->toArray();
-        $info['avatar'] = $info['avatar'] ? get_image_url($info['avatar']) : '';
-        $info['balance'] = number_format($info['balance'], 2, '.', '');
+        $info['thumb'] = $info['thumb'] ? get_image_url($info['thumb']) : '';
         $info['create_time_text'] = date('Y-m-d H:i:s', (int)$info['create_time']);
-        $info['login_time_text'] = $info['login_time'] ? date('Y-m-d H:i:s', (int)$info['login_time']) : '-';
-
         return [
             'code' => 0,
             'msg' => '获取成功',
@@ -471,63 +201,6 @@ class MeetingService extends BaseService
     }
 
     /**
-     * 添加会员
-     */
-    public function add()
-    {
-        $params = request()->all();
-
-        // 检查手机号是否已存在
-        $mobile = $params['mobile'] ?? '';
-        $exists = MemberModel::where('mobile', $mobile)
-            ->where('mark', 1)
-            ->exists();
-
-        if ($exists) {
-            return ['code' => 1, 'msg' => '手机号已存在'];
-        }
-
-        // 处理头像
-        $avatar = $params['avatar'] ?? '';
-        if ($avatar) {
-            $params['avatar'] = get_image_path($avatar);
-        }
-
-        // 处理密码
-        if (isset($params['password']) && $params['password']) {
-            $params['password'] = get_password($params['password']);
-        }
-
-        $data = [
-            'openid' => $params['openid'] ?? '',
-            'mobile' => $mobile,
-            'user_type' => (int)($params['user_type'] ?? 1),
-            'password' => $params['password'] ?? '',
-            'member_level' => (int)($params['member_level'] ?? 0),
-            'realname' => $params['realname'] ?? '',
-            'nickname' => $params['nickname'] ?? '',
-            'gender' => (int)($params['gender'] ?? 3),
-            'avatar' => $params['avatar'] ?? '',
-            'balance' => (float)($params['balance'] ?? 0),
-            'parent_id' => (int)($params['parent_id'] ?? 0),
-            'status' => (int)($params['status'] ?? 1),
-            'source' => (int)($params['source'] ?? 2),
-            'create_time' => time(),
-            'update_time' => time(),
-            'mark' => 1
-        ];
-
-        $result = MemberModel::insert($data);
-
-        if ($result) {
-            RedisService::keyDel("caches:members:count*");
-            return ['code' => 0, 'msg' => '添加成功'];
-        }
-
-        return ['code' => 1, 'msg' => '添加失败'];
-    }
-
-    /**
      * 设置状态
      */
     public function status()
@@ -536,19 +209,19 @@ class MeetingService extends BaseService
         $id = $params['id'] ?? 0;
         $status = $params['status'] ?? 1;
 
-        $member = MemberModel::where('id', $id)
+        $info = MeetingModel::where('id', $id)
             ->where('mark', 1)
             ->first();
 
-        if (!$member) {
-            return ['code' => 1, 'msg' => '记录不存在'];
+        if (!$info) {
+            return ['code' => 1, 'msg' => '会议不存在'];
         }
 
-        $member->status = $status;
-        $member->update_time = time();
-        $member->save();
+        $info->status = $status;
+        $info->update_time = time();
+        $info->save();
 
-        RedisService::clear("caches:members:info_{$id}");
+        RedisService::clear("caches:meeting:info_{$id}");
         return ['code' => 0, 'msg' => '设置成功'];
     }
 
@@ -559,35 +232,29 @@ class MeetingService extends BaseService
     public function delete()
     {
         $id = request()->input('id');
-
+        $this->model->where(['mark' => 0])->delete();
         if (is_array($id)) {
             // 批量删除
-            $count = MemberModel::whereIn('id', $id)
+            $count = MeetingModel::whereIn('id', $id)
                 ->where('mark', 1)
                 ->update(['mark' => 0, 'update_time' => time()]);
 
-            foreach ($id as $memberId) {
-                RedisService::clear("caches:members:info_{$memberId}");
-            }
-
-            RedisService::keyDel("caches:members:count*");
             return ['code' => 0, 'msg' => "成功删除{$count}条记录"];
         } else {
             // 单个删除
-            $member = MemberModel::where('id', $id)
+            $info = MeetingModel::where('id', $id)
                 ->where('mark', 1)
                 ->first();
 
-            if (!$member) {
-                return ['code' => 1, 'msg' => '记录不存在'];
+            if (!$info) {
+                return ['code' => 1, 'msg' => '会议不存在'];
             }
 
-            $member->mark = 0;
-            $member->update_time = time();
-            $member->save();
+            $info->mark = 0;
+            $info->update_time = time();
+            $info->save();
 
-            RedisService::clear("caches:members:info_{$id}");
-            RedisService::keyDel("caches:members:count*");
+            RedisService::clear("caches:meeting:info_{$id}*");
             return ['code' => 0, 'msg' => '删除成功'];
         }
     }

routes/web.php

@@ -249,3 +249,11 @@ Route::get('/complaint/info', [\App\Http\Controllers\Admin\ComplaintController::
 Route::post('/complaint/edit', [\App\Http\Controllers\Admin\ComplaintController::class, 'edit']);
 Route::post('/complaint/delete', [\App\Http\Controllers\Admin\ComplaintController::class, 'delete']);
 Route::post('/complaint/status', [\App\Http\Controllers\Admin\ComplaintController::class, 'status']);
+
+
+// 会议管理
+Route::get('/meeting/index', [\App\Http\Controllers\Admin\MeetC::class, 'index']);
+Route::get('/meeting/info', [\App\Http\Controllers\Admin\ComplaintController::class, 'info']);
+Route::post('/meeting/edit', [\App\Http\Controllers\Admin\ComplaintController::class, 'edit']);
+Route::post('/meeting/delete', [\App\Http\Controllers\Admin\ComplaintController::class, 'delete']);
+Route::post('/meeting/status', [\App\Http\Controllers\Admin\ComplaintController::class, 'status']);