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
2026-03-24 11:59:09 +08:00
parent 434aa8c69d
commit 76ccb24679
59 changed files with 2902 additions and 237 deletions
--- a/pro_v3.5.1/app/controller/admin/v1/hjf/QueueController.php
+++ b/pro_v3.5.1/app/controller/admin/v1/hjf/QueueController.php
@@ -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));
+    }
+}