{$metrics.todayPost} {:__('篇')}
+{$metrics.rangePost} {:__('篇')}
++{$metrics.todayPost} {:__('篇')}
+diff --git a/application/admin/controller/fc/Area.php b/application/admin/controller/fc/Area.php index 43648e4..89fb35e 100644 --- a/application/admin/controller/fc/Area.php +++ b/application/admin/controller/fc/Area.php @@ -19,6 +19,12 @@ class Area extends Backend */ protected $model = null; + /** + * 快速搜索字段 + * @var string + */ + protected $searchFields = 'id,province,city,district'; + public function _initialize() { parent::_initialize(); @@ -101,5 +107,9 @@ class Area extends Backend $this->error($field === 'lat' ? '纬度格式不正确' : '经度格式不正确'); } } + + if (isset($params['sort']) && $params['sort'] !== '' && (int)$params['sort'] < 0) { + $this->error('排序权重不能为负数'); + } } } diff --git a/application/admin/controller/fc/Banner.php b/application/admin/controller/fc/Banner.php index 4bae53f..4701325 100644 --- a/application/admin/controller/fc/Banner.php +++ b/application/admin/controller/fc/Banner.php @@ -18,11 +18,56 @@ class Banner extends Backend */ protected $model = null; + /** + * 快速搜索字段 + * @var string + */ + protected $searchFields = 'id,title'; + public function _initialize() { parent::_initialize(); $this->model = new \app\admin\model\FcBanner; + } + /** + * 新增轮播图前校验排序权重等边界值 + * + * @return string + */ + public function add() + { + if ($this->request->isPost()) { + $this->validateBannerParams($this->request->post('row/a', [])); + } + return parent::add(); + } + + /** + * 编辑轮播图前校验排序权重等边界值 + * + * @param mixed $ids + * @return string + */ + public function edit($ids = null) + { + if ($this->request->isPost()) { + $this->validateBannerParams($this->request->post('row/a', [])); + } + return parent::edit($ids); + } + + /** + * 校验轮播图表单边界参数 + * + * @param array $params + * @return void + */ + protected function validateBannerParams(array $params) + { + if (isset($params['sort']) && $params['sort'] !== '' && (int)$params['sort'] < 0) { + $this->error('排序权重不能为负数'); + } } diff --git a/application/admin/controller/fc/Category.php b/application/admin/controller/fc/Category.php index 0eb34e8..25fa0fa 100644 --- a/application/admin/controller/fc/Category.php +++ b/application/admin/controller/fc/Category.php @@ -19,6 +19,12 @@ class Category extends Backend */ protected $model = null; + /** + * 快速搜索字段 + * @var string + */ + protected $searchFields = 'id,name,icon_key'; + protected $noNeedRight = ['selectpage']; /** @@ -225,6 +231,9 @@ class Category extends Backend */ protected function normalizeCategoryParams(array $params, $currentId = 0) { + if (isset($params['sort']) && $params['sort'] !== '' && (int)$params['sort'] < 0) { + $this->error('排序权重不能为负数'); + } $pid = isset($params['pid']) ? max(0, (int)$params['pid']) : 0; if ($currentId > 0 && $pid === $currentId) { $pid = 0; diff --git a/application/admin/controller/fc/Comment.php b/application/admin/controller/fc/Comment.php index 63499a0..0ab8a67 100644 --- a/application/admin/controller/fc/Comment.php +++ b/application/admin/controller/fc/Comment.php @@ -93,6 +93,58 @@ class Comment extends Backend $this->success($top === 1 ? '置顶成功' : '取消置顶成功'); } + /** + * 切换评价显示/隐藏状态(支持单条与批量) + * + * @return void + */ + public function status() + { + $ids = $this->request->post('ids'); + $status = (int)$this->request->post('status', -1); + $reason = trim((string)$this->request->post('reason', '')); + if (!in_array($status, [0, 1], true)) { + $this->error('状态参数错误'); + } + $ids = is_array($ids) ? $ids : explode(',', (string)$ids); + $ids = array_filter(array_map('intval', $ids)); + if (!$ids) { + $this->error('请选择要操作的评价'); + } + + $now = time(); + $comments = $status === 0 + ? Db::name('fc_comment')->where('id', 'in', $ids)->field('id,user_id,post_id,content,status')->select() + : []; + + Db::name('fc_comment')->where('id', 'in', $ids)->update([ + 'status' => $status, + 'updatetime' => $now, + ]); + + // 隐藏评价时,向对应评价发布者发送系统站内信通知 + if ($status === 0 && $comments) { + foreach ($comments as $cmt) { + if ((int)$cmt['status'] === 0 || (int)$cmt['user_id'] <= 0) { + continue; + } + $snippet = mb_substr((string)$cmt['content'], 0, 20) . (mb_strlen((string)$cmt['content']) > 20 ? '...' : ''); + $reasonText = $reason !== '' ? ",原因:{$reason}" : ''; + Db::name('fc_message')->insert([ + 'user_id' => (int)$cmt['user_id'], + 'type' => 'system', + 'title' => '评价隐藏通知', + 'content' => "您发布的评价「{$snippet}」已被管理员隐藏{$reasonText}。您仍可在原信息详情页查看或删除该评价。", + 'extra' => json_encode(['path' => '/pages/detail/detail', 'id' => (int)$cmt['post_id']], JSON_UNESCAPED_UNICODE), + 'isread' => 0, + 'createtime' => $now, + 'updatetime' => $now, + ]); + } + } + + $this->success($status === 1 ? '已恢复显示' : '已隐藏评价'); + } } diff --git a/application/admin/controller/fc/Dashboard.php b/application/admin/controller/fc/Dashboard.php index 51403cb..9bcdfd3 100644 --- a/application/admin/controller/fc/Dashboard.php +++ b/application/admin/controller/fc/Dashboard.php @@ -9,123 +9,463 @@ use think\Db; * 同城分类信息 - 数据总览与运营看板 * * 后台核心运营仪表盘: - * 1. 今日核心指标与昨日对比(发布量 / 订单额 / 新增用户 / 浏览曝光量) + * 1. 核心 KPI 双维展示(累计总计 + 今日新增 + 较昨日对比 + 选中日期区间统计) * 2. 待办督办中心(帖子待审 / 商家待审 / 提现待审 / 举报待处理) - * 3. 多时段多维趋势分析(近 7 天 / 14 天 / 30 天,支持发布量、订单额、新增用户、浏览量平滑折线图) - * 4. 营收来源构成分析(会员购买 / 发帖付费 / 置顶推广 / 付费查看等占比环形图) - * 5. 热门分类发帖分布与同城区域活跃排行 - * 6. 用户、会员、商户与分销生态资产全景 + * 3. 全局日期统计切换(全部累计 / 今日 / 昨日 / 近7天 / 近14天 / 近30天 / 本月 / 自定义区间) + * 4. 营收来源构成、热门分类发帖分布、同城区域排行(支持按所选日期动态联动) + * 5. 多维趋势分析图与每日数据明细表 + * 6. 会员、商户与分销生态资产(累计总计 + 今日新增) * * @icon fa fa-dashboard */ class Dashboard extends Backend { /** - * 数据总览首页入口与数据下发 + * 数据总览首页入口与 AJAX 筛选接口 * * @return string|\think\response\Json */ public function index() { - $todayStart = strtotime('today'); - $todayEnd = $todayStart + 86400 - 1; + $todayStart = strtotime('today'); + $todayEnd = $todayStart + 86400 - 1; $yesterdayStart = $todayStart - 86400; $yesterdayEnd = $todayStart - 1; - /* ========================================================= - * 1. 核心 KPI(今日、较昨日对比、累计总量) - * ========================================================= */ - // 发布量 - $todayPost = (int)Db::name('fc_post')->where('createtime', 'between', [$todayStart, $todayEnd])->count(); - $yesterdayPost = (int)Db::name('fc_post')->where('createtime', 'between', [$yesterdayStart, $yesterdayEnd])->count(); - $totalPost = (int)Db::name('fc_post')->count(); + // 解析日期筛选参数(默认全部累计,支持按日期切换) + $rangeKey = $this->request->get('range', 'all'); + $startDate = $this->request->get('start_date', ''); + $endDate = $this->request->get('end_date', ''); + $period = $this->resolveDateRange($rangeKey, $startDate, $endDate, $todayStart, $todayEnd); - // 订单额与笔数(仅统计已支付订单) - $todayOrderAmount = round((float)Db::name('fc_order')->where('status', 'paid') - ->whereTime('paytime|createtime', 'between', [$todayStart, $todayEnd])->sum('amount'), 2); - $yesterdayOrderAmount = round((float)Db::name('fc_order')->where('status', 'paid') - ->whereTime('paytime|createtime', 'between', [$yesterdayStart, $yesterdayEnd])->sum('amount'), 2); - $totalOrderAmount = round((float)Db::name('fc_order')->where('status', 'paid')->sum('amount'), 2); - $todayOrderCount = (int)Db::name('fc_order')->where('status', 'paid') - ->whereTime('paytime|createtime', 'between', [$todayStart, $todayEnd])->count(); - $totalOrderCount = (int)Db::name('fc_order')->where('status', 'paid')->count(); + // 如果是 AJAX 局部筛选请求,直接返回对应日期区间的完整数据包 + if ($this->request->isAjax() && $this->request->get('action') === 'filter') { + $filterData = $this->buildPeriodPayload( + $period, + $todayStart, + $todayEnd, + $yesterdayStart, + $yesterdayEnd + ); + return json(['code' => 1, 'msg' => 'ok', 'data' => $filterData]); + } - // 用户与会员 - $todayUser = (int)Db::name('user')->where('createtime', 'between', [$todayStart, $todayEnd])->count(); - $yesterdayUser = (int)Db::name('user')->where('createtime', 'between', [$yesterdayStart, $yesterdayEnd])->count(); + // 首屏全量数据组装 + $metrics = $this->getCoreMetrics($todayStart, $todayEnd, $yesterdayStart, $yesterdayEnd, $period); + $pending = $this->getPendingSummary(); + $ecosystem = $this->getEcosystemStats($todayStart, $todayEnd, $period, $metrics['rangeUser']); + + // 区间联动模块(营收构成、分类分布、区域排行、趋势图) + $rangeStart = $period['is_all'] ? null : $period['start']; + $rangeEnd = $period['is_all'] ? null : $period['end']; + + $revenueData = $this->getRevenueBreakdown($rangeStart, $rangeEnd); + $categoryData = $this->getCategoryRanks($rangeStart, $rangeEnd); + $areaRanks = $this->getAreaRanks($rangeStart, $rangeEnd); + $trendData = $this->getTrendSeries($period['trend_start'], $period['trend_end']); + + $this->view->assign('metrics', $metrics); + $this->view->assign('pending', $pending); + $this->view->assign('ecosystem', $ecosystem); + $this->view->assign('period', $period); + $this->view->assign('revenueTypes', $revenueData['items']); + $this->view->assign('revenueTotal', $revenueData['total']); + $this->view->assign('categoryRanks', $categoryData['items']); + $this->view->assign('categoryTotal', $categoryData['total']); + $this->view->assign('areaRanks', $areaRanks); + $this->view->assign('trendRows', $trendData['rows']); + $this->view->assign('updatedAt', date('Y-m-d H:i')); + + // 向前端 RequireJS 传入初始配置 + $this->assignconfig('initialTrend', $trendData); + $this->assignconfig('revenueTypes', $revenueData['items']); + $this->assignconfig('initialPeriod', $period); + + return $this->view->fetch(); + } + + /** + * 组装 AJAX 日期切换时的响应数据包 + * + * @param array $period 解析后的日期区间信息 + * @param int $todayStart 今日开始时间戳 + * @param int $todayEnd 今日结束时间戳 + * @param int $yesterdayStart 昨日开始时间戳 + * @param int $yesterdayEnd 昨日结束时间戳 + * @return array + */ + protected function buildPeriodPayload(array $period, $todayStart, $todayEnd, $yesterdayStart, $yesterdayEnd) + { + $metrics = $this->getCoreMetrics($todayStart, $todayEnd, $yesterdayStart, $yesterdayEnd, $period); + $ecosystem = $this->getEcosystemStats($todayStart, $todayEnd, $period, $metrics['rangeUser']); + $rangeStart = $period['is_all'] ? null : $period['start']; + $rangeEnd = $period['is_all'] ? null : $period['end']; + $revenueData = $this->getRevenueBreakdown($rangeStart, $rangeEnd); + $categoryData = $this->getCategoryRanks($rangeStart, $rangeEnd); + $areaRanks = $this->getAreaRanks($rangeStart, $rangeEnd); + $trendData = $this->getTrendSeries($period['trend_start'], $period['trend_end']); + + return [ + 'period' => $period, + 'metrics' => $metrics, + 'ecosystem' => $ecosystem, + 'revenueTypes' => $revenueData['items'], + 'revenueTotal' => $revenueData['total'], + 'categoryRanks' => $categoryData['items'], + 'categoryTotal' => $categoryData['total'], + 'areaRanks' => $areaRanks, + 'trend' => $trendData, + 'updatedAt' => date('Y-m-d H:i'), + ]; + } + + /** + * 解析日期统计切换参数,统一返回区间起止时间戳与展示标签 + * + * @param string $rangeKey 预设标识 (today/yesterday/7d/14d/30d/month/all/custom) + * @param string $startDate 自定义开始日期 Y-m-d + * @param string $endDate 自定义结束日期 Y-m-d + * @param int $todayStart 今日零点时间戳 + * @param int $todayEnd 今日末点时间戳 + * @return array + */ + protected function resolveDateRange($rangeKey, $startDate, $endDate, $todayStart, $todayEnd) + { + $isAll = false; + $label = '近 14 天'; + $start = $todayStart - 13 * 86400; + $end = $todayEnd; + + switch ($rangeKey) { + case 'today': + $start = $todayStart; + $end = $todayEnd; + $label = '今日'; + break; + case 'yesterday': + $start = $todayStart - 86400; + $end = $todayStart - 1; + $label = '昨日'; + break; + case '7d': + $start = $todayStart - 6 * 86400; + $end = $todayEnd; + $label = '近 7 天'; + break; + case '30d': + $start = $todayStart - 29 * 86400; + $end = $todayEnd; + $label = '近 30 天'; + break; + case 'month': + $start = strtotime(date('Y-m-01 00:00:00')); + $end = $todayEnd; + $label = '本月'; + break; + case 'all': + $isAll = true; + $start = 0; + $end = $todayEnd; + $label = '全部累计'; + break; + case 'custom': + $sTs = $startDate ? strtotime($startDate . ' 00:00:00') : false; + $eTs = $endDate ? strtotime($endDate . ' 23:59:59') : false; + if ($sTs !== false && $eTs !== false) { + if ($sTs > $eTs) { + $tmp = $sTs; + $sTs = strtotime(date('Y-m-d 00:00:00', $eTs)); + $eTs = strtotime(date('Y-m-d 23:59:59', $tmp)); + } + // 自定义跨度最大限制 90 天,防止图表过密 + if (($eTs - $sTs) > 90 * 86400) { + $sTs = strtotime(date('Y-m-d 00:00:00', $eTs - 89 * 86400)); + } + $start = $sTs; + $end = $eTs; + $label = date('Y-m-d', $start) . ' ~ ' . date('Y-m-d', $end); + } else { + $rangeKey = '14d'; + } + break; + case '14d': + default: + $rangeKey = '14d'; + $start = $todayStart - 13 * 86400; + $end = $todayEnd; + $label = '近 14 天'; + break; + } + + // 趋势图时间范围:全部累计时展示近 30 天趋势,其余展示所选区间 + $trendStart = $isAll ? ($todayStart - 29 * 86400) : $start; + $trendEnd = $end; + $days = (int)floor(($trendEnd - $trendStart) / 86400) + 1; + + return [ + 'key' => $rangeKey, + 'label' => $label, + 'is_all' => $isAll, + 'start' => $start, + 'end' => $end, + 'start_date' => $isAll ? '' : date('Y-m-d', $start), + 'end_date' => date('Y-m-d', $end), + 'trend_start' => $trendStart, + 'trend_end' => $trendEnd, + 'days' => max(1, $days), + ]; + } + + /** + * 获取订单实际支付归属时间 SQL 表达式(优先取非 0 的 paytime,否则取 createtime) + * + * @param string $alias 表别名(可选) + * @return string + */ + protected function getOrderTimeExpr($alias = '') + { + $prefix = $alias ? $alias . '.' : ''; + return "COALESCE(NULLIF({$prefix}paytime, 0), {$prefix}createtime)"; + } + + /** + * 获取用户注册归属时间 SQL 表达式(优先取非 0 的 createtime,否则取 jointime) + * + * @param string $alias 表别名(可选) + * @return string + */ + protected function getUserTimeExpr($alias = '') + { + $prefix = $alias ? $alias . '.' : ''; + return "COALESCE(NULLIF({$prefix}createtime, 0), {$prefix}jointime)"; + } + + /** + * 计算指定时间区间内的已支付订单净实收金额(已扣除退款) + * + * @param int|null $startTs 开始时间戳(null 表示不限) + * @param int|null $endTs 结束时间戳(null 表示不限) + * @return float + */ + protected function sumNetOrderAmount($startTs = null, $endTs = null) + { + $orderTimeExpr = $this->getOrderTimeExpr(); + $netAmountExpr = "GREATEST(amount - IFNULL(refund_amount, 0), 0)"; + $query = Db::name('fc_order')->where('status', 'paid'); + if ($startTs !== null && $endTs !== null) { + $s = (int)$startTs; + $e = (int)$endTs; + $query->whereRaw("{$orderTimeExpr} BETWEEN {$s} AND {$e}"); + } + return round((float)$query->value("SUM({$netAmountExpr})"), 2); + } + + /** + * 统计核心 KPI 指标(累计总计 + 今日新增 + 较昨日对比 + 所选日期区间) + * + * @param int $todayStart 今日开始时间戳 + * @param int $todayEnd 今日结束时间戳 + * @param int $yesterdayStart 昨日开始时间戳 + * @param int $yesterdayEnd 昨日结束时间戳 + * @param array $period 当前选中的日期区间 + * @return array + */ + protected function getCoreMetrics($todayStart, $todayEnd, $yesterdayStart, $yesterdayEnd, array $period) + { + $orderTimeExpr = $this->getOrderTimeExpr(); + $userTimeExpr = $this->getUserTimeExpr(); + + // 1. 发布量(过滤软删除) + $totalPost = (int)Db::name('fc_post')->whereNull('deletetime')->count(); + $todayPost = (int)Db::name('fc_post')->whereNull('deletetime')->where('createtime', 'between', [$todayStart, $todayEnd])->count(); + $yesterdayPost = (int)Db::name('fc_post')->whereNull('deletetime')->where('createtime', 'between', [$yesterdayStart, $yesterdayEnd])->count(); + $rangePost = $period['is_all'] + ? $totalPost + : (int)Db::name('fc_post')->whereNull('deletetime')->where('createtime', 'between', [$period['start'], $period['end']])->count(); + + // 2. 订单实收与笔数(仅统计已支付,扣除退款金额,按实际支付时间归属) + $totalOrderAmount = $this->sumNetOrderAmount(); + $todayOrderAmount = $this->sumNetOrderAmount($todayStart, $todayEnd); + $yesterdayOrderAmount = $this->sumNetOrderAmount($yesterdayStart, $yesterdayEnd); + $rangeOrderAmount = $period['is_all'] + ? $totalOrderAmount + : $this->sumNetOrderAmount($period['start'], $period['end']); + + $totalOrderCount = (int)Db::name('fc_order')->where('status', 'paid')->count(); + $todayOrderCount = (int)Db::name('fc_order')->where('status', 'paid') + ->whereRaw("{$orderTimeExpr} BETWEEN " . (int)$todayStart . " AND " . (int)$todayEnd)->count(); + $rangeOrderCount = $period['is_all'] + ? $totalOrderCount + : (int)Db::name('fc_order')->where('status', 'paid') + ->whereRaw("{$orderTimeExpr} BETWEEN " . (int)$period['start'] . " AND " . (int)$period['end'])->count(); + + // 3. 注册用户 $totalUser = (int)Db::name('user')->count(); - $memberCount = (int)Db::name('fc_user_ext')->where('is_member', 1)->count(); - $merchantCount = (int)Db::name('fc_merchant')->count(); - $recommendMerchantCount = (int)Db::name('fc_merchant')->where('recommend', 1)->count(); + $todayUser = (int)Db::name('user')->whereRaw("{$userTimeExpr} BETWEEN " . (int)$todayStart . " AND " . (int)$todayEnd)->count(); + $yesterdayUser = (int)Db::name('user')->whereRaw("{$userTimeExpr} BETWEEN " . (int)$yesterdayStart . " AND " . (int)$yesterdayEnd)->count(); + $rangeUser = $period['is_all'] + ? $totalUser + : (int)Db::name('user')->whereRaw("{$userTimeExpr} BETWEEN " . (int)$period['start'] . " AND " . (int)$period['end'])->count(); - // 浏览量 PV + // 4. 浏览曝光量(全部累计取帖子总 views,按时间筛选时取 fc_view_log 浏览记录) + $totalViews = (int)Db::name('fc_post')->whereNull('deletetime')->sum('views'); $todayViews = (int)Db::name('fc_view_log')->where('createtime', 'between', [$todayStart, $todayEnd])->count(); $yesterdayViews = (int)Db::name('fc_view_log')->where('createtime', 'between', [$yesterdayStart, $yesterdayEnd])->count(); - $totalViews = (int)Db::name('fc_post')->sum('views'); + $rangeViews = $period['is_all'] + ? $totalViews + : (int)Db::name('fc_view_log')->where('createtime', 'between', [$period['start'], $period['end']])->count(); - $metrics = [ + return [ 'todayPost' => $todayPost, 'yesterdayPost' => $yesterdayPost, 'postDelta' => $todayPost - $yesterdayPost, 'totalPost' => $totalPost, + 'rangePost' => $rangePost, 'todayOrderAmount' => $todayOrderAmount, 'yesterdayOrderAmount' => $yesterdayOrderAmount, 'orderDelta' => round($todayOrderAmount - $yesterdayOrderAmount, 2), 'totalOrderAmount' => $totalOrderAmount, + 'rangeOrderAmount' => $rangeOrderAmount, 'todayOrderCount' => $todayOrderCount, 'totalOrderCount' => $totalOrderCount, + 'rangeOrderCount' => $rangeOrderCount, 'todayUser' => $todayUser, 'yesterdayUser' => $yesterdayUser, 'userDelta' => $todayUser - $yesterdayUser, 'totalUser' => $totalUser, - 'memberCount' => $memberCount, - 'merchantCount' => $merchantCount, - 'recommendMerchant' => $recommendMerchantCount, + 'rangeUser' => $rangeUser, 'todayViews' => $todayViews, 'yesterdayViews' => $yesterdayViews, 'viewsDelta' => $todayViews - $yesterdayViews, 'totalViews' => $totalViews, + 'rangeViews' => $rangeViews, ]; + } - /* ========================================================= - * 2. 待办督办中心(待审核事项与预警) - * ========================================================= */ - $pendingPost = (int)Db::name('fc_post')->where('audit_status', 0)->count(); - $pendingMerchant = (int)Db::name('fc_merchant')->where('audit_status', 0)->count(); - $pendingWithdraw = (int)Db::name('fc_withdraw')->where('status', 'auditing')->count(); + /** + * 获取待办督办统计数据 + * + * @return array + */ + protected function getPendingSummary() + { + $pendingPost = (int)Db::name('fc_post')->whereNull('deletetime')->where('audit_status', 0)->count(); + $pendingMerchant = (int)Db::name('fc_merchant')->where('audit_status', 0)->count(); + $pendingWithdraw = (int)Db::name('fc_withdraw')->where('status', 'auditing')->count(); $pendingWithdrawAmount = round((float)Db::name('fc_withdraw')->where('status', 'auditing')->sum('amount'), 2); - $pendingReport = (int)Db::name('fc_report')->where('status', 'pending')->count(); - $pendingTotal = $pendingPost + $pendingMerchant + $pendingWithdraw + $pendingReport; + $pendingReport = (int)Db::name('fc_report')->where('status', 'pending')->count(); - $pending = [ - 'total' => $pendingTotal, - 'post' => $pendingPost, - 'merchant' => $pendingMerchant, - 'withdraw' => $pendingWithdraw, - 'withdrawAmount' => $pendingWithdrawAmount, - 'report' => $pendingReport, + return [ + 'total' => $pendingPost + $pendingMerchant + $pendingWithdraw + $pendingReport, + 'post' => $pendingPost, + 'merchant' => $pendingMerchant, + 'withdraw' => $pendingWithdraw, + 'withdrawAmount' => $pendingWithdrawAmount, + 'report' => $pendingReport, ]; + } - /* ========================================================= - * 3. 平台生态与分销资产 - * ========================================================= */ - $commissionPending = round((float)Db::name('fc_commission')->where('status', 0)->sum('amount'), 2); - $commissionSettled = round((float)Db::name('fc_commission')->where('status', 1)->sum('amount'), 2); - $distributorCount = (int)Db::name('fc_dist_relation')->distinct(true)->field('parent_id')->count(); + /** + * 获取平台生态资产统计(主指标随筛选时间区间变化,同时保留今日新增) + * + * @param int $todayStart 今日开始时间戳 + * @param int $todayEnd 今日结束时间戳 + * @param array $period 当前选中的日期区间 + * @param int $rangeUser 当前选定区间的新增/总用户数 + * @return array + */ + protected function getEcosystemStats($todayStart, $todayEnd, array $period, $rangeUser) + { + $now = time(); + $orderTimeExpr = $this->getOrderTimeExpr(); + $isAll = !empty($period['is_all']); + $s = (int)$period['start']; + $e = (int)$period['end']; - $ecosystem = [ - 'commissionPending' => $commissionPending, - 'commissionSettled' => $commissionSettled, - 'distributorCount' => $distributorCount, - 'memberRate' => $totalUser > 0 ? round(($memberCount / $totalUser) * 100, 1) : 0, + // VIP 会员:全部累计时取当前有效 VIP 会员总数;按时间筛选时取区间内支付开通/续费的去重会员数 + if ($isAll) { + $memberCount = (int)Db::name('fc_user_ext') + ->where('is_member', 1) + ->where(function ($query) use ($now) { + $query->where('member_expiretime', '>', $now) + ->whereOr('member_expiretime', 0) + ->whereOr('member_expiretime', 'null'); + }) + ->count(); + } else { + $memberCount = (int)Db::name('fc_order') + ->where('status', 'paid') + ->where('type', 'member') + ->whereRaw("{$orderTimeExpr} BETWEEN {$s} AND {$e}") + ->count('DISTINCT user_id'); + } + + // 今日新开通/续费会员人数(按今日已支付 member 订单去重统计) + $todayMemberCount = (int)Db::name('fc_order') + ->where('status', 'paid') + ->where('type', 'member') + ->whereRaw("{$orderTimeExpr} BETWEEN " . (int)$todayStart . " AND " . (int)$todayEnd) + ->count('DISTINCT user_id'); + + // 已审核通过的入驻商户(按筛选时间) + $merchantQuery = Db::name('fc_merchant')->where('audit_status', 1); + $recommendQuery = Db::name('fc_merchant')->where('audit_status', 1)->where('recommend', 1); + if (!$isAll) { + $merchantQuery->where('createtime', 'between', [$s, $e]); + $recommendQuery->where('createtime', 'between', [$s, $e]); + } + $merchantCount = (int)$merchantQuery->count(); + $recommendMerchantCount = (int)$recommendQuery->count(); + $todayMerchantCount = (int)Db::name('fc_merchant')->where('audit_status', 1)->where('createtime', 'between', [$todayStart, $todayEnd])->count(); + + // 推广分销员人数(按筛选时间,按 parent_id 去重) + $distQuery = Db::name('fc_dist_relation')->where('parent_id', '>', 0); + if (!$isAll) { + $distQuery->where('createtime', 'between', [$s, $e]); + } + $distributorCount = (int)$distQuery->count('DISTINCT parent_id'); + $todayDistributorCount = (int)Db::name('fc_dist_relation')->where('parent_id', '>', 0)->where('createtime', 'between', [$todayStart, $todayEnd])->count('DISTINCT parent_id'); + + // 佣金统计(按筛选时间 + 今日新增) + $settledQuery = Db::name('fc_commission')->where('status', 1); + $pendingQuery = Db::name('fc_commission')->where('status', 0); + if (!$isAll) { + $settledQuery->where('createtime', 'between', [$s, $e]); + $pendingQuery->where('createtime', 'between', [$s, $e]); + } + $commissionSettled = round((float)$settledQuery->sum('amount'), 2); + $commissionPending = round((float)$pendingQuery->sum('amount'), 2); + $todayCommissionPending = round((float)Db::name('fc_commission')->where('status', 0)->where('createtime', 'between', [$todayStart, $todayEnd])->sum('amount'), 2); + $todayCommissionSettled = round((float)Db::name('fc_commission')->where('status', 1)->where('createtime', 'between', [$todayStart, $todayEnd])->sum('amount'), 2); + + return [ + 'memberCount' => $memberCount, + 'todayMemberCount' => $todayMemberCount, + 'memberRate' => $rangeUser > 0 ? min(100, round(($memberCount / $rangeUser) * 100, 1)) : 0, + 'merchantCount' => $merchantCount, + 'todayMerchantCount' => $todayMerchantCount, + 'recommendMerchant' => $recommendMerchantCount, + 'distributorCount' => $distributorCount, + 'todayDistributorCount' => $todayDistributorCount, + 'commissionPending' => $commissionPending, + 'commissionSettled' => $commissionSettled, + 'todayCommissionPending' => $todayCommissionPending, + 'todayCommissionSettled' => $todayCommissionSettled, ]; + } - /* ========================================================= - * 4. 营收构成分析(按订单类型统计已支付实收) - * ========================================================= */ + /** + * 获取营收来源构成(支持按日期范围筛选,null 表示全部累计) + * + * @param int|null $startTs 开始时间戳 + * @param int|null $endTs 结束时间戳 + * @return array + */ + protected function getRevenueBreakdown($startTs = null, $endTs = null) + { $orderTypeLabels = [ 'member' => 'VIP会员购买', 'post' => '发布信息付费', @@ -135,21 +475,26 @@ class Dashboard extends Backend 'refresh' => '信息刷新', ]; - $rawRevenue = Db::name('fc_order') - ->where('status', 'paid') - ->fieldRaw("type, count(*) as count, sum(amount) as amount") + $query = Db::name('fc_order')->where('status', 'paid'); + if ($startTs !== null && $endTs !== null) { + $orderTimeExpr = $this->getOrderTimeExpr(); + $query->whereRaw("{$orderTimeExpr} BETWEEN " . (int)$startTs . " AND " . (int)$endTs); + } + + $rawRevenue = $query + ->fieldRaw("type, count(*) as count, sum(GREATEST(amount - IFNULL(refund_amount, 0), 0)) as amount") ->group('type') ->order('amount', 'desc') ->select(); - $revenueTotalSum = 0; - $revenueTypes = []; + $totalSum = 0; + $items = []; foreach ($rawRevenue as $r) { - $amt = round((float)$r['amount'], 2); - $cnt = (int)$r['count']; - $label = isset($orderTypeLabels[$r['type']]) ? $orderTypeLabels[$r['type']] : ($r['type'] ? $r['type'] : '其他服务'); - $revenueTotalSum += $amt; - $revenueTypes[] = [ + $amt = round((float)$r['amount'], 2); + $cnt = (int)$r['count']; + $label = isset($orderTypeLabels[$r['type']]) ? $orderTypeLabels[$r['type']] : ($r['type'] ?: '其他服务'); + $totalSum += $amt; + $items[] = [ 'type' => $r['type'], 'label' => $label, 'count' => $cnt, @@ -157,75 +502,122 @@ class Dashboard extends Backend ]; } - foreach ($revenueTypes as &$item) { - $item['percent'] = $revenueTotalSum > 0 ? round(($item['amount'] / $revenueTotalSum) * 100, 1) : 0; + $totalSum = round($totalSum, 2); + foreach ($items as &$item) { + $item['percent'] = $totalSum > 0 ? round(($item['amount'] / $totalSum) * 100, 1) : 0; } unset($item); - /* ========================================================= - * 5. 热门分类发帖分布与同城区域排行 - * ========================================================= */ - // 一级分类发帖分布 + return ['total' => $totalSum, 'items' => $items]; + } + + /** + * 获取一级分类发帖分布(过滤软删除帖子,支持日期范围筛选) + * + * @param int|null $startTs 开始时间戳 + * @param int|null $endTs 结束时间戳 + * @return array + */ + protected function getCategoryRanks($startTs = null, $endTs = null) + { + $prefix = config('database.prefix'); + $joinCond = "(p.category_id = c.id OR p.category_id IN (SELECT sub.id FROM {$prefix}fc_category sub WHERE sub.pid = c.id)) AND p.deletetime IS NULL"; + if ($startTs !== null && $endTs !== null) { + $joinCond .= " AND p.createtime BETWEEN " . (int)$startTs . " AND " . (int)$endTs; + } + $rawCategories = Db::name('fc_category') ->alias('c') - ->join('__FC_POST__ p', '(p.category_id = c.id OR p.category_id IN (SELECT sub.id FROM ' . config('database.prefix') . 'fc_category sub WHERE sub.pid = c.id))', 'LEFT') + ->join('__FC_POST__ p', $joinCond, 'LEFT') ->where('c.pid', 0) ->field('c.id, c.name, count(p.id) as post_count') ->group('c.id') ->order('post_count', 'desc') ->select(); - $categoryTotal = 0; - $categoryRanks = []; + $total = 0; + $items = []; foreach ($rawCategories as $c) { - $cnt = (int)$c['post_count']; - $categoryTotal += $cnt; - $categoryRanks[] = [ + $cnt = (int)$c['post_count']; + $total += $cnt; + $items[] = [ 'id' => $c['id'], 'name' => $c['name'], 'count' => $cnt, ]; } - foreach ($categoryRanks as &$cItem) { - $cItem['percent'] = $categoryTotal > 0 ? round(($cItem['count'] / $categoryTotal) * 100, 1) : 0; + + foreach ($items as &$cItem) { + $cItem['percent'] = $total > 0 ? round(($cItem['count'] / $total) * 100, 1) : 0; } unset($cItem); - // 同城热门地区 Top 5 - $rawAreas = Db::name('fc_post') + return ['total' => $total, 'items' => $items]; + } + + /** + * 获取同城热门活跃区域 Top 5(过滤软删除帖子,支持日期范围筛选) + * + * @param int|null $startTs 开始时间戳 + * @param int|null $endTs 结束时间戳 + * @return array + */ + protected function getAreaRanks($startTs = null, $endTs = null) + { + $query = Db::name('fc_post') + ->whereNull('deletetime') + ->where("area != '' OR city != ''"); + + if ($startTs !== null && $endTs !== null) { + $query->where('createtime', 'between', [$startTs, $endTs]); + } + + $rawAreas = $query ->fieldRaw("IF(area != '', area, city) as region_name, count(*) as count") - ->where("area != '' OR city != ''") ->group('region_name') ->order('count', 'desc') ->limit(5) ->select(); - $areaRanks = []; - $areaMaxCount = 1; + + $items = []; + $maxCount = 1; foreach ($rawAreas as $ar) { $cnt = (int)$ar['count']; - if ($cnt > $areaMaxCount) { - $areaMaxCount = $cnt; + if ($cnt > $maxCount) { + $maxCount = $cnt; } - $areaRanks[] = [ - 'region_name' => $ar['region_name'] ? $ar['region_name'] : '未知区域', + $items[] = [ + 'region_name' => $ar['region_name'] ?: '未知区域', 'count' => $cnt, ]; } - foreach ($areaRanks as &$arItem) { - $arItem['percent'] = round(($arItem['count'] / $areaMaxCount) * 100, 1); + + foreach ($items as &$arItem) { + $arItem['percent'] = round(($arItem['count'] / $maxCount) * 100, 1); } unset($arItem); - /* ========================================================= - * 6. 多时段趋势数据计算(近 7 天 / 14 天 / 30 天) - * ========================================================= */ - $maxTrendDays = 30; - $trendStart = $todayStart - ($maxTrendDays - 1) * 86400; + return $items; + } + + /** + * 按起止时间戳生成多维度分日趋势序列与明细表行 + * + * @param int $startTs 开始时间戳 + * @param int $endTs 结束时间戳 + * @return array + */ + protected function getTrendSeries($startTs, $endTs) + { + $orderTimeExpr = $this->getOrderTimeExpr(); + $userTimeExpr = $this->getUserTimeExpr(); + $netAmountExpr = "GREATEST(amount - IFNULL(refund_amount, 0), 0)"; // 发帖趋势 - $postsMap = []; + $postsMap = []; $postsQuery = Db::name('fc_post') - ->where('createtime', 'between', [$trendStart, $todayEnd]) + ->whereNull('deletetime') + ->where('createtime', 'between', [$startTs, $endTs]) ->fieldRaw("FROM_UNIXTIME(`createtime`,'%Y-%m-%d') AS day, COUNT(*) AS num") ->group('day') ->select(); @@ -233,12 +625,12 @@ class Dashboard extends Backend $postsMap[$row['day']] = (int)$row['num']; } - // 订单额趋势 - $ordersMap = []; + // 订单实收趋势 + $ordersMap = []; $ordersQuery = Db::name('fc_order') ->where('status', 'paid') - ->whereTime('paytime|createtime', 'between', [$trendStart, $todayEnd]) - ->fieldRaw("FROM_UNIXTIME(IFNULL(`paytime`,`createtime`),'%Y-%m-%d') AS day, SUM(`amount`) AS num") + ->whereRaw("{$orderTimeExpr} BETWEEN " . (int)$startTs . " AND " . (int)$endTs) + ->fieldRaw("FROM_UNIXTIME({$orderTimeExpr},'%Y-%m-%d') AS day, SUM({$netAmountExpr}) AS num") ->group('day') ->select(); foreach ($ordersQuery as $row) { @@ -246,10 +638,10 @@ class Dashboard extends Backend } // 新增用户趋势 - $usersMap = []; + $usersMap = []; $usersQuery = Db::name('user') - ->where('createtime', 'between', [$trendStart, $todayEnd]) - ->fieldRaw("FROM_UNIXTIME(`createtime`,'%Y-%m-%d') AS day, COUNT(*) AS num") + ->whereRaw("{$userTimeExpr} BETWEEN " . (int)$startTs . " AND " . (int)$endTs) + ->fieldRaw("FROM_UNIXTIME({$userTimeExpr},'%Y-%m-%d') AS day, COUNT(*) AS num") ->group('day') ->select(); foreach ($usersQuery as $row) { @@ -257,9 +649,9 @@ class Dashboard extends Backend } // 浏览量趋势 - $viewsMap = []; + $viewsMap = []; $viewsQuery = Db::name('fc_view_log') - ->where('createtime', 'between', [$trendStart, $todayEnd]) + ->where('createtime', 'between', [$startTs, $endTs]) ->fieldRaw("FROM_UNIXTIME(`createtime`,'%Y-%m-%d') AS day, COUNT(*) AS num") ->group('day') ->select(); @@ -267,74 +659,44 @@ class Dashboard extends Backend $viewsMap[$row['day']] = (int)$row['num']; } - // 计算 7/14/30 天数据包 - $ranges = [7, 14, 30]; - $allTrends = []; - foreach ($ranges as $span) { - $startTs = $todayStart - ($span - 1) * 86400; - $dates = []; - $posts = []; - $orders = []; - $users = []; - $views = []; - $rows = []; - for ($i = 0; $i < $span; $i++) { - $day = date('Y-m-d', $startTs + $i * 86400); - $p = isset($postsMap[$day]) ? $postsMap[$day] : 0; - $o = isset($ordersMap[$day]) ? $ordersMap[$day] : 0; - $u = isset($usersMap[$day]) ? $usersMap[$day] : 0; - $v = isset($viewsMap[$day]) ? $viewsMap[$day] : 0; + $dates = []; + $posts = []; + $orders = []; + $users = []; + $views = []; + $rows = []; - $dates[] = $day; - $posts[] = $p; - $orders[] = $o; - $users[] = $u; - $views[] = $v; - $rows[] = [ - 'date' => $day, - 'posts' => $p, - 'orders' => $o, - 'users' => $u, - 'views' => $v, - ]; - } - $allTrends[$span] = [ - 'dates' => $dates, - 'posts' => $posts, - 'orders' => $orders, - 'users' => $users, - 'views' => $views, - 'rows' => array_reverse($rows), + $cursor = strtotime(date('Y-m-d 00:00:00', $startTs)); + $limit = strtotime(date('Y-m-d 00:00:00', $endTs)); + while ($cursor <= $limit) { + $day = date('Y-m-d', $cursor); + $p = isset($postsMap[$day]) ? $postsMap[$day] : 0; + $o = isset($ordersMap[$day]) ? $ordersMap[$day] : 0; + $u = isset($usersMap[$day]) ? $usersMap[$day] : 0; + $v = isset($viewsMap[$day]) ? $viewsMap[$day] : 0; + + $dates[] = $day; + $posts[] = $p; + $orders[] = $o; + $users[] = $u; + $views[] = $v; + $rows[] = [ + 'date' => $day, + 'posts' => $p, + 'orders' => $o, + 'users' => $u, + 'views' => $v, ]; + $cursor += 86400; } - // 如果是 AJAX 请求局部刷新趋势,可直接返回对应时段数据 - if ($this->request->isAjax() && $this->request->get('action') === 'trend') { - $days = (int)$this->request->get('days', 14); - $trendData = isset($allTrends[$days]) ? $allTrends[$days] : $allTrends[14]; - return json(['code' => 1, 'msg' => 'ok', 'data' => $trendData]); - } - - // 默认 14 天用于模板首屏初始化 - $defaultTrend = $allTrends[14]; - - /* ========================================================= - * 7. 视图变量绑定与前端配置传递 - * ========================================================= */ - $this->view->assign('metrics', $metrics); - $this->view->assign('pending', $pending); - $this->view->assign('ecosystem', $ecosystem); - $this->view->assign('revenueTypes', $revenueTypes); - $this->view->assign('categoryRanks', $categoryRanks); - $this->view->assign('areaRanks', $areaRanks); - $this->view->assign('trendRows', $defaultTrend['rows']); - $this->view->assign('updatedAt', date('Y-m-d H:i')); - - // 向前端 RequireJS 传入完整时段数据包及分类分布,供平滑渲染交互 - $this->assignconfig('allTrends', $allTrends); - $this->assignconfig('revenueTypes', $revenueTypes); - $this->assignconfig('categoryRanks', $categoryRanks); - - return $this->view->fetch(); + return [ + 'dates' => $dates, + 'posts' => $posts, + 'orders' => $orders, + 'users' => $users, + 'views' => $views, + 'rows' => array_reverse($rows), + ]; } } diff --git a/application/admin/controller/fc/Post.php b/application/admin/controller/fc/Post.php index 71b56f8..98528fd 100644 --- a/application/admin/controller/fc/Post.php +++ b/application/admin/controller/fc/Post.php @@ -20,6 +20,12 @@ class Post extends Backend */ protected $model = null; + /** + * 快速搜索字段 + * @var string + */ + protected $searchFields = 'id,title,content,contact,phone'; + /** * 无需鉴权的方法(只读辅助接口;审核/置顶/下架/上架必须走权限节点) * @var array @@ -32,6 +38,46 @@ class Post extends Backend $this->model = new \app\admin\model\FcPost; } + /** + * 新增信息前校验价格等边界参数 + * + * @return string + */ + public function add() + { + if ($this->request->isPost()) { + $this->validatePostParams($this->request->post('row/a', [])); + } + return parent::add(); + } + + /** + * 编辑信息前校验价格等边界参数 + * + * @param mixed $ids + * @return string + */ + public function edit($ids = null) + { + if ($this->request->isPost()) { + $this->validatePostParams($this->request->post('row/a', [])); + } + return parent::edit($ids); + } + + /** + * 校验信息表单边界参数(如价格不可为负数) + * + * @param array $params + * @return void + */ + protected function validatePostParams(array $params) + { + if (isset($params['price']) && $params['price'] !== '' && (float)$params['price'] < 0) { + $this->error('价格不能为负数'); + } + } + /** * 查看信息列表 * diff --git a/application/admin/controller/fc/Postaudit.php b/application/admin/controller/fc/Postaudit.php index 3680e6f..989cde7 100644 --- a/application/admin/controller/fc/Postaudit.php +++ b/application/admin/controller/fc/Postaudit.php @@ -19,6 +19,12 @@ class Postaudit extends Backend */ protected $model = null; + /** + * 快速搜索字段 + * @var string + */ + protected $searchFields = 'id,title,content,contact,phone'; + /** * 无需鉴权的方法(只读辅助接口) * @var array diff --git a/application/admin/controller/fc/Report.php b/application/admin/controller/fc/Report.php index 62cbccc..6421161 100644 --- a/application/admin/controller/fc/Report.php +++ b/application/admin/controller/fc/Report.php @@ -405,6 +405,22 @@ class Report extends Backend 'status' => 0, 'updatetime' => $now, ]); + + // 通知被隐藏评价的发布者 + if ($cmt && (int)$cmt['user_id'] > 0 && (int)$cmt['status'] !== 0) { + $cmtSnippet = mb_substr((string)$cmt['content'], 0, 20) . (mb_strlen((string)$cmt['content']) > 20 ? '...' : ''); + $reasonNote = $remark !== '' ? $remark : $report['reason']; + Db::name('fc_message')->insert([ + 'user_id' => (int)$cmt['user_id'], + 'type' => 'system', + 'title' => '评价违规隐藏通知', + 'content' => "您发布的评价「{$cmtSnippet}」因被举报核实违规({$reasonNote})已被平台隐藏。您仍可在原信息详情页查看或删除该评价。", + 'extra' => json_encode(['path' => '/pages/detail/detail', 'id' => (int)$cmt['post_id']], JSON_UNESCAPED_UNICODE), + 'isread' => 0, + 'createtime' => $now, + 'updatetime' => $now, + ]); + } } } else { if ($report['target_type'] === 'post') { diff --git a/application/admin/lang/zh-cn/fc/dashboard.php b/application/admin/lang/zh-cn/fc/dashboard.php index 79fb3fc..b98b508 100644 --- a/application/admin/lang/zh-cn/fc/dashboard.php +++ b/application/admin/lang/zh-cn/fc/dashboard.php @@ -90,4 +90,39 @@ return [ '信息曝光量 (次)' => '信息曝光量 (次)', '暂无明细数据' => '暂无明细数据', '元' => '元', + '订单额仅统计已支付实收净额(已扣退款)' => '订单额仅统计已支付实收净额(已扣退款)', + '日期统计切换' => '日期统计切换', + '统计周期' => '统计周期', + '选择统计周期' => '选择统计周期', + '全部累计' => '全部累计', + '今日' => '今日', + '昨日' => '昨日', + '本月' => '本月', + '开始日期' => '开始日期', + '至' => '至', + '结束日期' => '结束日期', + '筛选' => '筛选', + '当前:' => '当前:', + '核心运营指标' => '核心运营指标', + '信息发布量' => '信息发布量', + '累计总计' => '累计总计', + '今日新增' => '今日新增', + '订单实收' => '订单实收', + '注册用户' => '注册用户', + '信息曝光量' => '信息曝光量', + '今日浏览' => '今日浏览', + '该时段暂无已支付订单数据' => '该时段暂无已支付订单数据', + '该时段暂无分类发帖数据' => '该时段暂无分类发帖数据', + '该时段暂无地区发布数据' => '该时段暂无地区发布数据', + '会员沉淀、商户入驻及分销裂变体系(累计总计 / 今日新增)' + => '会员沉淀、商户入驻及分销裂变体系(累计总计 / 今日新增)', + '已审入驻商户' => '已审入驻商户', + '每日数据明细' => '每日数据明细', + '暂无数据' => '暂无数据', + '数据加载失败' => '数据加载失败', + '网络异常,请稍后重试' => '网络异常,请稍后重试', + '请选择完整的开始和结束日期' => '请选择完整的开始和结束日期', + '全站累计' => '全站累计', + '会员沉淀、商户入驻及分销裂变体系(所选周期统计 / 今日新增)' + => '会员沉淀、商户入驻及分销裂变体系(所选周期统计 / 今日新增)', ]; diff --git a/application/admin/view/fc/comment/index.html b/application/admin/view/fc/comment/index.html index 8cb38c4..3f4824f 100644 --- a/application/admin/view/fc/comment/index.html +++ b/application/admin/view/fc/comment/index.html @@ -7,6 +7,8 @@