scottpan/huangjingfen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(fsgx): HJF queue merge, brokerage timing, cycle commission, points release

Browse Source 
- 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
2026-03-24 11:59:09 +08:00
parent 434aa8c69d
commit 76ccb24679
59 changed files with 2902 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pro_v3.5.1/app/services/user/UserServices.php
View File

@@ -770,6 +770,21 @@ class UserServices extends BaseServices
// 添加过滤条件
$where['is_filter_del'] = 1;
// HJF：按分销等级 grade 筛选，转换为 agent_level ID 范围
if (isset($where['hjf_member_level']) && $where['hjf_member_level'] !== '') {
$grade = (int)$where['hjf_member_level'];
/** @var AgentLevelServices $agentLevelSvc */
$agentLevelSvc = app()->make(AgentLevelServices::class);
if ($grade > 0) {
$levelId = $agentLevelSvc->getLevelIdByGrade($grade);
$where['agent_level'] = $levelId > 0 ? $levelId : -1;
} else {
// grade=0 表示"无分销等级"
$where['agent_level'] = 0;
}
}
unset($where['hjf_member_level']);
/** @var UserWechatuserServices $userWechatUser */
$userWechatUser = app()->make(UserWechatuserServices::class);
$fields = 'u.*,w.country,w.province,w.city,w.sex,w.unionid,w.openid,w.user_type as w_user_type,w.groupid,w.tagid_list,w.subscribe,w.subscribe_time';
@@ -799,6 +814,11 @@ class UserServices extends BaseServices
$clientData = $workClientService->getList(['uid' => $uids], ['id', 'uid', 'name', 'external_userid', 'corp_id', 'unionid'], false);
$clientlist = $clientData['list'] ?? [];
/** HJF：分销等级展示索引（is_del=0，按 id/grade 双索引，优先 HJF 官方等级名称） */
/** @var AgentLevelServices $agentLevelServices */
$agentLevelServices = app()->make(AgentLevelServices::class);
$hjfLevelMaps = $agentLevelServices->loadHjfUserListLevelMaps();
// 补充信息
$extendInfo = SystemConfigService::get('user_extend_info', []);
$is_extend_info = false;
@@ -878,6 +898,14 @@ class UserServices extends BaseServices
$item['svip_over_day'] = 0;
}
// 分销等级（HJF 扩展：member_level=grade 数值，member_level_name=等级名称）
$agentLevelId = (int)($item['agent_level'] ?? 0);
$hjfLevelInfo = $agentLevelServices->pickHjfLevelRowForUserListDisplay($agentLevelId, $hjfLevelMaps);
$item['member_level'] = $hjfLevelInfo ? (int)$hjfLevelInfo['grade'] : null;
$item['member_level_name'] = $hjfLevelInfo ? ($hjfLevelInfo['name'] ?? '') : '';
$item['available_points'] = (int)($item['available_points'] ?? 0);
$item['frozen_points'] = (int)($item['frozen_points'] ?? 0);
// 标签
$item['labels'] = $userlabel[$item['uid']] ?? '';