451918bc73
Bug3: 解耦积分奖励与佣金发放，报单订单只要推荐人存在即触发积分， 不再依赖 brokeragePrice > 0；grantFrozenPointsByBrokerage 移至 佣金判断之前独立执行。 Bug1: 定时任务手动触发返回真实结果 —— 补充 fsgx_release_frozen_points 到 taskName 映射；runNow() try/catch 后抛出异常；控制器捕获并返回 fail；修复 SystemTimer listener catch 块运算符优先级 bug。 Bug5: PointsReleaseServices 每日释放同步写入 eb_user_bill，使管理 后台积分日志页面可见；UserPointServices::pointRecord $status 数组 补充 hjf_frozen_direct/hjf_frozen_umbrella/frozen_points_release 等 fsgx 类型映射，防止未知类型报错。 Bug2: hjfMember.js getTeamData 改为 POST 与路由匹配；loadTeamData 字段映射 total/totalLevel/order_count → 界面展示字段。 Bug4: 新增 HjfPatchMissingRewards 命令（hjf:patch-rewards），支持 扫描全量/指定订单补发缺失积分奖励，支持 --dry-run 预览；注册命令 到 config/console.php。 Made-with: Cursor
156 lines
4.1 KiB
PHP
156 lines
4.1 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\controller\admin\v1\system;
|
||
|
||
use app\controller\admin\AuthController;
|
||
use app\services\system\timer\SystemTimerServices;
|
||
use think\annotation\Inject;
|
||
|
||
/**
|
||
* 定时任务表控制器
|
||
* Class SystemTimer
|
||
* @package app\controller\admin\v1\system
|
||
*/
|
||
class SystemTimer extends AuthController
|
||
{
|
||
|
||
/**
|
||
* @var SystemTimerServices
|
||
*/
|
||
#[Inject]
|
||
protected SystemTimerServices $services;
|
||
|
||
/**
|
||
* 定时任务名称及标识
|
||
* @return mixed
|
||
*/
|
||
public function task_name()
|
||
{
|
||
return $this->success($this->services->getTasKName());
|
||
}
|
||
|
||
/**
|
||
* 显示列表
|
||
* @return mixed
|
||
*/
|
||
public function index()
|
||
{
|
||
$where['is_del'] = 0;
|
||
return $this->success($this->services->getTimerList($where));
|
||
}
|
||
|
||
/**
|
||
* 删除指定资源
|
||
* @param string $id
|
||
* @return \think\Response
|
||
*/
|
||
public function delete($id)
|
||
{
|
||
$this->services->del($id);
|
||
$this->services->delOneTimerCache($id);
|
||
return $this->success('删除成功');
|
||
}
|
||
|
||
/**
|
||
* 修改状态
|
||
* @param string $is_show
|
||
* @param string $id
|
||
*/
|
||
public function set_show($id = '', $is_show = '')
|
||
{
|
||
if ($is_show == '' || $id == '') return $this->fail('缺少参数');
|
||
$this->services->setShow($id, $is_show);
|
||
$this->services->updateOneTimerCache($id);
|
||
return $this->success($is_show == 1 ? '显示成功' : '隐藏成功');
|
||
}
|
||
|
||
/**获取单条定时器数据
|
||
* @param $id
|
||
* @return void
|
||
*/
|
||
public function get_timer_one($id)
|
||
{
|
||
return $this->success($this->services->getOneTimer($id));
|
||
}
|
||
|
||
/**
|
||
* 保存定时任务
|
||
* @return mixed
|
||
*/
|
||
public function save()
|
||
{
|
||
$data = $this->request->postMore([
|
||
['name', ''],
|
||
['mark', ''],
|
||
['type', 0],
|
||
['title', ''],
|
||
['is_open', 0],
|
||
['cycle', '']
|
||
]);
|
||
if (!$data['name']) {
|
||
return $this->fail('请输入定时任务名称');
|
||
}
|
||
if (!$data['mark']) {
|
||
return $this->fail('请输入定时任务标识');
|
||
}
|
||
$this->services->createData($data);
|
||
$this->services->setAllTimerCache();
|
||
return $this->success('添加定时器成功!');
|
||
}
|
||
|
||
/**
|
||
* 手动立即触发一个定时任务
|
||
* @param $id
|
||
* @return mixed
|
||
*/
|
||
public function run_now($id)
|
||
{
|
||
$timer = $this->services->getOneTimer($id);
|
||
$mark = $timer['mark'] ?? '';
|
||
if (!$mark) {
|
||
return $this->fail('定时任务标识不存在');
|
||
}
|
||
try {
|
||
$this->services->runNow($mark);
|
||
return $this->success('任务已触发并执行成功');
|
||
} catch (\Throwable $e) {
|
||
return $this->fail($e->getMessage());
|
||
}
|
||
}
|
||
|
||
/**
|
||
* 更新定时任务
|
||
* @param $id
|
||
* @return mixed
|
||
*/
|
||
public function update($id)
|
||
{
|
||
$data = $this->request->postMore([
|
||
['name', ''],
|
||
['mark', ''],
|
||
['type', 0],
|
||
['title', ''],
|
||
['is_open', 0],
|
||
['cycle', '']
|
||
]);
|
||
if (!$data['name']) {
|
||
return $this->fail('请输入定时任务名称');
|
||
}
|
||
if (!$data['mark']) {
|
||
return $this->fail('请输入定时任务标识');
|
||
}
|
||
$this->services->editData($id, $data);
|
||
$this->services->updateOneTimerCache($id);
|
||
return $this->success('修改成功!');
|
||
}
|
||
}
|
||
|