mirror of
https://github.com/crmeb/CRMEB.git
synced 2026-10-28 21:40:50 +00:00
f9ba517389
后端
- NoticeLogDao::getStatistics() 原实现复用同一个查询构造器，where 条件累积，
导致 failed 恒为 0、success 含全部状态；改为每次基于独立条件 count。
- 抽出 buildWhere() 统一组装条件，列表与统计共用；统计不叠加状态条件。
- status=0（待发送）是合法筛选值，原 empty() 判断会丢弃，改为 isset + 非空串判断。
- page/limit 做整数与上限（100）校验，避免非法分页参数。
- 列表接口返回 { list, count }，供前端分页使用。
前端
- 补充分页组件，搜索/重置/清理后回到第一页并同时刷新列表与统计。
- 兼容列表接口旧格式（数组）与新格式（{ list, count }）。
117 lines
3.8 KiB
PHP
117 lines
3.8 KiB
PHP
<?php
|
||
// +----------------------------------------------------------------------
|
||
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
|
||
// +----------------------------------------------------------------------
|
||
// | Copyright (c) 2016~2026 https://www.crmeb.com All rights reserved.
|
||
// +----------------------------------------------------------------------
|
||
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
|
||
// +----------------------------------------------------------------------
|
||
// | Author: CRMEB Team <admin@crmeb.com>
|
||
// +----------------------------------------------------------------------
|
||
|
||
namespace app\services\message\admin;
|
||
|
||
use crmeb\basic\BaseService;
|
||
use app\dao\message\NoticeLogDao;
|
||
use app\model\message\NoticeLog;
|
||
|
||
class NoticeLogServices extends BaseService
|
||
{
|
||
protected $dao;
|
||
|
||
public function __construct(NoticeLogDao $dao)
|
||
{
|
||
$this->dao = $dao;
|
||
}
|
||
|
||
/**
|
||
* 组装查询条件
|
||
* @param array $filter 筛选条件
|
||
* @param bool $withStatus 是否附加状态条件（统计口径不按状态过滤，否则成功/失败恒为 0）
|
||
* @return array
|
||
*/
|
||
protected function buildWhere(array $filter, bool $withStatus = true): array
|
||
{
|
||
$where = [];
|
||
if (!empty($filter['mark'])) {
|
||
$where['mark'] = trim((string)$filter['mark']);
|
||
}
|
||
if (!empty($filter['uid'])) {
|
||
$where['uid'] = (int)$filter['uid'];
|
||
}
|
||
if (!empty($filter['channel_key'])) {
|
||
$where['channel_key'] = $filter['channel_key'];
|
||
}
|
||
// 状态 0（待发送）是合法筛选值，不能用 empty 判断，否则会被丢弃
|
||
if ($withStatus && isset($filter['status']) && $filter['status'] !== '' && $filter['status'] !== null) {
|
||
$where['status'] = (int)$filter['status'];
|
||
}
|
||
if (!empty($filter['start_time']) && !empty($filter['end_time'])) {
|
||
$where['send_time'] = [(int)$filter['start_time'], (int)$filter['end_time']];
|
||
}
|
||
return $where;
|
||
}
|
||
|
||
/**
|
||
* 发送记录列表
|
||
* @param array $filter
|
||
* @param int $page
|
||
* @param int $limit
|
||
* @return array{list: array, count: int}
|
||
*/
|
||
public function getList(array $filter = [], int $page = 1, int $limit = 20): array
|
||
{
|
||
$where = $this->buildWhere($filter);
|
||
return [
|
||
'list' => $this->dao->getList($where, '*', $page, $limit),
|
||
'count' => $this->dao->getCount($where),
|
||
];
|
||
}
|
||
|
||
public function getDetail(int $id): array
|
||
{
|
||
$info = $this->dao->get($id);
|
||
return $info ? $info->toArray() : [];
|
||
}
|
||
|
||
/**
|
||
* 发送统计（与列表使用同一套筛选条件，状态筛选除外）
|
||
* @param array $filter
|
||
* @return array
|
||
*/
|
||
public function getStatistics(array $filter = []): array
|
||
{
|
||
return $this->dao->getStatistics($this->buildWhere($filter, false));
|
||
}
|
||
|
||
public function createLog(string $mark, int $uid, string $channelKey, string $channelName, string $title = '', string $content = ''): int
|
||
{
|
||
$data = [
|
||
'mark' => $mark,
|
||
'uid' => $uid,
|
||
'channel_key' => $channelKey,
|
||
'channel_name' => $channelName,
|
||
'title' => $title,
|
||
'content' => $content,
|
||
'status' => NoticeLog::STATUS_PENDING,
|
||
];
|
||
return $this->dao->createLog($data);
|
||
}
|
||
|
||
public function logSuccess(int $id): bool
|
||
{
|
||
return $this->dao->updateStatus($id, NoticeLog::STATUS_SUCCESS);
|
||
}
|
||
|
||
public function logFailed(int $id, string $errorMsg): bool
|
||
{
|
||
return $this->dao->updateStatus($id, NoticeLog::STATUS_FAILED, $errorMsg);
|
||
}
|
||
|
||
public function cleanLogs(int $days = 30): int
|
||
{
|
||
$time = time() - $days * 86400;
|
||
return $this->dao->deleteByTime($time);
|
||
}
|
||
}
|