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/jobs/hjf/HjfOrderPayJob.php
+++ b/pro_v3.5.1/app/jobs/hjf/HjfOrderPayJob.php
@@ -0,0 +1,80 @@
+<?php
+declare(strict_types=1);
+
+namespace app\jobs\hjf;
+
+use app\services\agent\AgentLevelServices;
+use app\services\hjf\PointsRewardServices;
+use app\services\hjf\QueuePoolServices;
+use app\services\user\UserServices;
+use crmeb\basic\BaseJobs;
+use crmeb\traits\QueueTrait;
+use think\exception\ValidateException;
+use think\facade\Log;
+
+/**
+ * 报单商品支付成功异步处理 Job
+ *
+ * 触发时机：Pay 监听器检测到 is_queue_goods=1 时派发。
+ *
+ * 执行流程（改造复用版）：
+ *  1. 调用 QueuePoolServices::enqueue() 将订单写入公排池
+ *  2. 调用 PointsRewardServices::reward() 沿推荐链发放级差积分
+ *  3. 调用 AgentLevelServices::checkUserLevelFinish() 检查升级
+ *     （复用 CRMEB 分销等级升级流程，已支持 HJF 任务类型 6/7/8）
+ *
+ * Class HjfOrderPayJob
+ * @package app\jobs\hjf
+ */
+class HjfOrderPayJob extends BaseJobs
+{
+    use QueueTrait;
+
+    public function doJob(int $uid, string $orderId, float $amount = 3600.00): bool
+    {
+        try {
+            /** @var QueuePoolServices $queueServices */
+            $queueServices = app()->make(QueuePoolServices::class);
+            $queueServices->enqueue($uid, $orderId, $amount);
+            Log::info("[HjfOrderPay] 公排入队成功 uid={$uid} orderId={$orderId}");
+        } catch (ValidateException $e) {
+            Log::warning("[HjfOrderPay] 入队被锁，延迟重试 uid={$uid} orderId={$orderId}: " . $e->getMessage());
+            static::dispatchSece(5, [$uid, $orderId, $amount]);
+            return true;
+        } catch (\Throwable $e) {
+            Log::error("[HjfOrderPay] 公排入队异常 uid={$uid} orderId={$orderId}: " . $e->getMessage());
+            return false;
+        }
+
+        try {
+            /** @var PointsRewardServices $pointsServices */
+            $pointsServices = app()->make(PointsRewardServices::class);
+            $pointsServices->reward($uid, $orderId);
+            Log::info("[HjfOrderPay] 积分奖励发放完成 uid={$uid} orderId={$orderId}");
+        } catch (\Throwable $e) {
+            Log::error("[HjfOrderPay] 积分奖励失败 uid={$uid} orderId={$orderId}: " . $e->getMessage());
+        }
+
+        try {
+            /** @var UserServices $userServices */
+            $userServices = app()->make(UserServices::class);
+            $userInfo = $userServices->getUserCacheInfo($uid);
+            $spreadUid = $userInfo ? (int)($userInfo['spread_uid'] ?? 0) : 0;
+            $twoSpreadUid = 0;
+            if ($spreadUid > 0 && $oneUserInfo = $userServices->getUserCacheInfo($spreadUid)) {
+                $twoSpreadUid = $userServices->getSpreadUid($spreadUid, $oneUserInfo, false);
+            }
+            $uids = array_unique([$uid, $spreadUid, $twoSpreadUid]);
+
+            /** @var AgentLevelServices $agentLevelServices */
+            $agentLevelServices = app()->make(AgentLevelServices::class);
+            $agentLevelServices->checkUserLevelFinish($uid, $uids);
+
+            Log::info("[HjfOrderPay] 等级升级检查完成 uid={$uid}");
+        } catch (\Throwable $e) {
+            Log::error("[HjfOrderPay] 等级升级检查失败 uid={$uid}: " . $e->getMessage());
+        }
+
+        return true;
+    }
+}