feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release
- Add HJF jobs, services, DAOs, models, admin/API controllers, release command - Respect brokerage_timing (on_pay vs confirm); dispatch HjfOrderPayJob for queue goods - Queue-only cycle commission and position index fix in StoreOrderCreateServices - UserBill income types: frozen_points_brokerage, frozen_points_release - Timer: fsgx_release_frozen_points -> PointsReleaseServices - Agent tasks: no_assess filtering for direct/umbrella counts - Migrations: queue_pool, points_release_log, fsgx_v1 checklist updates - Admin/uniapp: crontab preset, membership level, user list, finance routes, docs Made-with: Cursor
This commit is contained in:
apple
161
pro_v3.5.1/app/controller/admin/v1/hjf/MemberController.php
Normal file
161
pro_v3.5.1/app/controller/admin/v1/hjf/MemberController.php
Normal file
@@ -0,0 +1,161 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace app\controller\admin\v1\hjf;
|
||||
|
||||
use app\controller\admin\AuthController;
|
||||
use app\dao\user\UserDao;
|
||||
use app\services\agent\AgentLevelServices;
|
||||
use app\services\hjf\MemberLevelServices;
|
||||
use think\annotation\Inject;
|
||||
|
||||
/**
|
||||
* Admin · 会员管理接口（改造复用版）
|
||||
*
|
||||
* 复用 eb_agent_level 体系，使用 eb_user.agent_level 字段。
|
||||
*
|
||||
* GET /adminapi/hjf/member/list — 会员列表
|
||||
* PUT /adminapi/hjf/member/level/:uid — 手动调整会员等级
|
||||
* GET /adminapi/hjf/member/config — 获取会员等级配置（从 eb_agent_level 读取）
|
||||
* POST /adminapi/hjf/member/config — 保存会员等级配置（写入 eb_agent_level）
|
||||
*
|
||||
* Class MemberController
|
||||
* @package app\controller\admin\v1\hjf
|
||||
*/
|
||||
class MemberController extends AuthController
|
||||
{
|
||||
#[Inject]
|
||||
protected UserDao $userDao;
|
||||
|
||||
#[Inject]
|
||||
protected MemberLevelServices $levelServices;
|
||||
|
||||
#[Inject]
|
||||
protected AgentLevelServices $agentLevelServices;
|
||||
|
||||
/**
|
||||
* 会员列表（分页）
|
||||
*/
|
||||
public function memberList(): mixed
|
||||
{
|
||||
$where = $this->request->getMore([
|
||||
['keyword', ''],
|
||||
['member_level', ''],
|
||||
['page', 1],
|
||||
['limit', 20],
|
||||
]);
|
||||
$page = (int)$where['page'];
|
||||
$limit = (int)$where['limit'];
|
||||
|
||||
$condition = [];
|
||||
if ($where['keyword'] !== '') {
|
||||
$condition['uid|nickname|phone'] = ['like', '%' . $where['keyword'] . '%'];
|
||||
}
|
||||
|
||||
if ($where['member_level'] !== '') {
|
||||
$grade = (int)$where['member_level'];
|
||||
if ($grade === 0) {
|
||||
$condition['agent_level'] = 0;
|
||||
} else {
|
||||
$agentLevelId = $this->agentLevelServices->getLevelIdByGrade($grade);
|
||||
$condition['agent_level'] = $agentLevelId ?: -1;
|
||||
}
|
||||
}
|
||||
|
||||
$count = $this->userDao->count($condition);
|
||||
$list = $this->userDao->selectList(
|
||||
$condition,
|
||||
'uid,nickname,avatar,phone,agent_level,frozen_points,available_points,now_money,spread_uid,add_time',
|
||||
$page,
|
||||
$limit,
|
||||
'uid',
|
||||
'desc'
|
||||
);
|
||||
|
||||
$levelList = $this->agentLevelServices->dao->getList(['is_del' => 0, 'status' => 1]);
|
||||
$levelMap = array_column($levelList, null, 'id');
|
||||
|
||||
foreach ($list as &$item) {
|
||||
$agentLevelId = (int)($item['agent_level'] ?? 0);
|
||||
$levelInfo = $levelMap[$agentLevelId] ?? null;
|
||||
$item['member_level'] = $levelInfo ? (int)$levelInfo['grade'] : 0;
|
||||
$item['member_level_name'] = $levelInfo ? $levelInfo['name'] : '普通会员';
|
||||
$item['direct_order_count'] = $this->levelServices->getDirectQueueOrderCount((int)$item['uid']);
|
||||
$item['umbrella_order_count'] = $this->levelServices->getUmbrellaQueueOrderCount((int)$item['uid']);
|
||||
$item['direct_spread_count'] = $this->levelServices->getDirectSpreadCount((int)$item['uid']);
|
||||
}
|
||||
unset($item);
|
||||
|
||||
return $this->success(compact('list', 'count'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 手动调整会员等级
|
||||
*/
|
||||
public function updateLevel(int $uid): mixed
|
||||
{
|
||||
$data = $this->request->getMore([
|
||||
['member_level', 0],
|
||||
]);
|
||||
$grade = (int)$data['member_level'];
|
||||
|
||||
if ($grade < 0 || $grade > 4) {
|
||||
return $this->fail('等级范围 0-4');
|
||||
}
|
||||
|
||||
$user = $this->userDao->get($uid);
|
||||
if (!$user) {
|
||||
return $this->fail('用户不存在');
|
||||
}
|
||||
|
||||
$this->levelServices->setUserLevel($uid, $grade);
|
||||
|
||||
return $this->success('更新成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取会员等级配置（从 eb_agent_level 表读取）
|
||||
*/
|
||||
public function getConfig(): mixed
|
||||
{
|
||||
$levelList = $this->agentLevelServices->dao->getList(['is_del' => 0, 'status' => 1]);
|
||||
$config = [];
|
||||
foreach ($levelList as $level) {
|
||||
$config[] = [
|
||||
'id' => $level['id'],
|
||||
'name' => $level['name'],
|
||||
'grade' => $level['grade'],
|
||||
'direct_reward_points' => $level['direct_reward_points'] ?? 0,
|
||||
'umbrella_reward_points' => $level['umbrella_reward_points'] ?? 0,
|
||||
];
|
||||
}
|
||||
return $this->success($config);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存会员等级配置（写入 eb_agent_level 表）
|
||||
*/
|
||||
public function saveConfig(): mixed
|
||||
{
|
||||
$levels = $this->request->post('levels', []);
|
||||
if (!is_array($levels)) {
|
||||
return $this->fail('参数格式错误');
|
||||
}
|
||||
|
||||
foreach ($levels as $item) {
|
||||
if (empty($item['id'])) continue;
|
||||
$updateData = [];
|
||||
if (isset($item['direct_reward_points'])) {
|
||||
$updateData['direct_reward_points'] = (int)$item['direct_reward_points'];
|
||||
}
|
||||
if (isset($item['umbrella_reward_points'])) {
|
||||
$updateData['umbrella_reward_points'] = (int)$item['umbrella_reward_points'];
|
||||
}
|
||||
if ($updateData) {
|
||||
$this->agentLevelServices->dao->update((int)$item['id'], $updateData);
|
||||
}
|
||||
}
|
||||
|
||||
return $this->success('保存成功');
|
||||
}
|
||||
}
|
||||
42
pro_v3.5.1/app/controller/admin/v1/hjf/PointsController.php
Normal file
42
pro_v3.5.1/app/controller/admin/v1/hjf/PointsController.php
Normal file
@@ -0,0 +1,42 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace app\controller\admin\v1\hjf;
|
||||
|
||||
use app\controller\admin\AuthController;
|
||||
use app\dao\hjf\PointsReleaseLogDao;
|
||||
use think\annotation\Inject;
|
||||
|
||||
/**
|
||||
* Admin · 积分管理接口
|
||||
*
|
||||
* GET /adminapi/hjf/points/release-log — 积分释放日志（分页）
|
||||
*
|
||||
* Class PointsController
|
||||
* @package app\controller\admin\v1\hjf
|
||||
*/
|
||||
class PointsController extends AuthController
|
||||
{
|
||||
#[Inject]
|
||||
protected PointsReleaseLogDao $dao;
|
||||
|
||||
/**
|
||||
* 积分释放日志（分页）
|
||||
*/
|
||||
public function releaseLog(): mixed
|
||||
{
|
||||
$where = $this->request->getMore([
|
||||
['keyword', ''],
|
||||
['type', ''],
|
||||
['start_time', ''],
|
||||
['end_time', ''],
|
||||
['page', 1],
|
||||
['limit', 20],
|
||||
]);
|
||||
$page = (int)$where['page'];
|
||||
$limit = (int)$where['limit'];
|
||||
unset($where['page'], $where['limit']);
|
||||
|
||||
return $this->success($this->dao->getAdminList($where, $page, $limit));
|
||||
}
|
||||
}
|
||||
105
pro_v3.5.1/app/controller/admin/v1/hjf/QueueController.php
Normal file
105
pro_v3.5.1/app/controller/admin/v1/hjf/QueueController.php
Normal file
@@ -0,0 +1,105 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace app\controller\admin\v1\hjf;
|
||||
|
||||
use app\controller\admin\AuthController;
|
||||
use app\dao\hjf\QueuePoolDao;
|
||||
use app\services\system\config\SystemConfigServices;
|
||||
use crmeb\services\SystemConfigService;
|
||||
use think\annotation\Inject;
|
||||
|
||||
/**
|
||||
* Admin · 公排管理接口
|
||||
*
|
||||
* GET /adminapi/hjf/queue/order — 公排订单列表
|
||||
* GET /adminapi/hjf/queue/config — 获取公排配置
|
||||
* POST /adminapi/hjf/queue/config — 保存公排配置
|
||||
* GET /adminapi/hjf/queue/finance — 公排退款财务流水
|
||||
*
|
||||
* Class QueueController
|
||||
* @package app\controller\admin\v1\hjf
|
||||
*/
|
||||
class QueueController extends AuthController
|
||||
{
|
||||
#[Inject]
|
||||
protected QueuePoolDao $dao;
|
||||
|
||||
/**
|
||||
* 公排订单列表（分页 + 筛选）
|
||||
*/
|
||||
public function orderList(): mixed
|
||||
{
|
||||
$where = $this->request->getMore([
|
||||
['keyword', ''],
|
||||
['status', ''],
|
||||
['start_time', ''],
|
||||
['end_time', ''],
|
||||
['page', 1],
|
||||
['limit', 20],
|
||||
]);
|
||||
$page = (int)$where['page'];
|
||||
$limit = (int)$where['limit'];
|
||||
unset($where['page'], $where['limit']);
|
||||
|
||||
return $this->success($this->dao->getAdminList($where, $page, $limit));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取公排配置
|
||||
*/
|
||||
public function getConfig(): mixed
|
||||
{
|
||||
$config = [
|
||||
'trigger_multiple' => (int)SystemConfigService::get('hjf_trigger_multiple', 4),
|
||||
'release_rate' => (int)SystemConfigService::get('hjf_release_rate', 4),
|
||||
'withdraw_fee_rate' => (int)SystemConfigService::get('hjf_withdraw_fee_rate', 7),
|
||||
'enabled' => (bool)SystemConfigService::get('hjf_queue_enabled', 1),
|
||||
];
|
||||
return $this->success($config);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存公排配置
|
||||
*/
|
||||
public function saveConfig(SystemConfigServices $configServices): mixed
|
||||
{
|
||||
$data = $this->request->getMore([
|
||||
['trigger_multiple', 4],
|
||||
['release_rate', 4],
|
||||
['withdraw_fee_rate', 7],
|
||||
['enabled', 1],
|
||||
]);
|
||||
|
||||
$map = [
|
||||
'hjf_trigger_multiple' => (int)$data['trigger_multiple'],
|
||||
'hjf_release_rate' => (int)$data['release_rate'],
|
||||
'hjf_withdraw_fee_rate' => (int)$data['withdraw_fee_rate'],
|
||||
'hjf_queue_enabled' => (int)$data['enabled'],
|
||||
];
|
||||
|
||||
foreach ($map as $key => $value) {
|
||||
$configServices->setConfig($key, (string)$value);
|
||||
}
|
||||
|
||||
return $this->success('保存成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 公排退款财务流水（分页）
|
||||
*/
|
||||
public function financeList(): mixed
|
||||
{
|
||||
$where = $this->request->getMore([
|
||||
['start_time', ''],
|
||||
['end_time', ''],
|
||||
['page', 1],
|
||||
['limit', 20],
|
||||
]);
|
||||
$page = (int)$where['page'];
|
||||
$limit = (int)$where['limit'];
|
||||
unset($where['page'], $where['limit']);
|
||||
|
||||
return $this->success($this->dao->getFinanceList($where, $page, $limit));
|
||||
}
|
||||
}
|
||||
@@ -106,6 +106,22 @@ class SystemTimer extends AuthController
|
||||
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('定时任务标识不存在');
|
||||
}
|
||||
$this->services->runNow($mark);
|
||||
return $this->success('任务已触发');
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新定时任务
|
||||
* @param $id
|
||||
|
||||
@@ -421,7 +421,13 @@ class SystemConfig extends AuthController
|
||||
|
||||
$is_store_stock = isset($post['store_stock']) && $post['store_stock'] != sys_config('store_stock');
|
||||
|
||||
// radio 类型字段：若历史 bug 导致 value 为单元素数组，自动展开为标量
|
||||
$radioScalarFields = ['brokerage_scope', 'brokerage_timing'];
|
||||
foreach ($post as $k => $v) {
|
||||
if (in_array($k, $radioScalarFields) && is_array($v) && count($v) === 1) {
|
||||
$v = $v[0];
|
||||
$post[$k] = $v;
|
||||
}
|
||||
$config_one = $this->services->getOne(['menu_name' => $k]);
|
||||
if ($config_one) {
|
||||
$config_one['value'] = $v;
|
||||
|
||||
@@ -85,6 +85,8 @@ class User extends AuthController
|
||||
['isMember', ''],
|
||||
['label_ids', ''],
|
||||
['is_channel', ''],
|
||||
/** HJF：按分销等级 grade（0–4）筛选，对应 eb_user.agent_level */
|
||||
['hjf_member_level', ''],
|
||||
]);
|
||||
if ($where['label_ids']) {
|
||||
$where['label_id'] = stringToIntArray($where['label_ids']);
|
||||
|
||||
Reference in New Issue
Block a user