fix(fsgx): 伞下人数与待释放积分发放链路

- spread/people 增加 umbrellaCount、umbrellaOrderCount；MemberLevelServices 递归统计伞下人数
- 佣金记录页使用新字段展示团队业绩
- 报单积分改由 HjfOrderPayJob 在等级升级后发放，避免 grade=0 时序问题
- PointsRewardServices::reward 按 points_release_log 幂等防重复
- 移除 backOrderBrokerage 内同步 grantFrozenPointsByBrokerage

Made-with: Cursor

pro_v3.5.1/app/jobs/hjf/HjfOrderPayJob.php

@@ -4,11 +4,13 @@ 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\Db;
 use think\facade\Log;
 
 /**
@@ -18,11 +20,10 @@ use think\facade\Log;
  *
  * 执行流程：
  *  1. 调用 QueuePoolServices::enqueue() 将订单写入公排池
- *  2. 调用 AgentLevelServices::checkUserLevelFinish() 检查升级
+ *  2. 调用 AgentLevelServices::checkUserLevelFinish() 检查等级升级
  *     （复用 CRMEB 分销等级升级流程，已支持 HJF 任务类型 6/7/8）
- *
- * 注意：积分奖励（直推/伞下）由 StoreOrderTakeServices::grantFrozenPointsByBrokerage
- *       在佣金发放时同步调用 PointsRewardServices::reward()，不在此 Job 中重复执行。
+ *  3. 等级升级完成后调用 PointsRewardServices::reward() 发放积分奖励
+ *     （必须在升级后执行，确保级差计算使用正确的 agent_level）
  *
  * Class HjfOrderPayJob
  * @package app\jobs\hjf
@@ -47,9 +48,6 @@ class HjfOrderPayJob extends BaseJobs
             return false;
         }
 
-        // 注意：积分奖励（PointsRewardServices::reward）已由 StoreOrderTakeServices::grantFrozenPointsByBrokerage
-        //       在佣金发放时同步调用，此处不再重复调用，避免双重发放 frozen_points。
-
         try {
             /** @var UserServices $userServices */
             $userServices = app()->make(UserServices::class);
@@ -70,6 +68,23 @@ class HjfOrderPayJob extends BaseJobs
             Log::error("[HjfOrderPay] 等级升级检查失败 uid={$uid}: " . $e->getMessage());
         }
 
+        // 等级升级完成后发放积分奖励（确保使用升级后的 agent_level）
+        try {
+            $orderRow = Db::name('store_order')
+                ->where('order_id', $orderId)
+                ->where('is_queue_goods', 1)
+                ->field('id,uid,is_queue_goods')
+                ->find();
+            if ($orderRow) {
+                /** @var PointsRewardServices $pointsService */
+                $pointsService = app()->make(PointsRewardServices::class);
+                $pointsService->reward($uid, $orderId, (int)$orderRow['id']);
+                Log::info("[HjfOrderPay] 积分奖励发放完成 uid={$uid} orderId={$orderId}");
+            }
+        } catch (\Throwable $e) {
+            Log::error("[HjfOrderPay] 积分奖励发放失败 uid={$uid} orderId={$orderId}: " . $e->getMessage());
+        }
+
         return true;
     }
 }

pro_v3.5.1/app/services/hjf/MemberLevelServices.php

@@ -111,6 +111,32 @@ class MemberLevelServices extends BaseServices
         return $this->agentLevelTaskServices->getUmbrellaQueueOrderCount($uid);
     }
 
+    /**
+     * 递归统计伞下总人数（DFS，最大深度 8 层，不含本人）
+     */
+    public function getUmbrellaMemberCount(int $uid, int $maxDepth = 8): int
+    {
+        return $this->recursiveUmbrellaMemberCount($uid, $maxDepth);
+    }
+
+    private function recursiveUmbrellaMemberCount(int $uid, int $remainDepth): int
+    {
+        if ($remainDepth <= 0) {
+            return 0;
+        }
+        $children = Db::name('user')
+            ->where('spread_uid', $uid)
+            ->column('uid');
+        if (empty($children)) {
+            return 0;
+        }
+        $count = count($children);
+        foreach ($children as $childUid) {
+            $count += $this->recursiveUmbrellaMemberCount((int)$childUid, $remainDepth - 1);
+        }
+        return $count;
+    }
+
     /**
      * 手动设置会员等级（管理后台使用）
      *

pro_v3.5.1/app/services/hjf/PointsRewardServices.php

@@ -45,6 +45,16 @@ class PointsRewardServices extends BaseServices
     public function reward(int $orderUid, string $orderId, int $orderDbId = 0): void
     {
         try {
+            // 幂等检查：若该订单已有积分奖励记录则跳过，防止重复发放
+            $exists = Db::name('points_release_log')
+                ->where('order_id', $orderId)
+                ->whereIn('type', ['reward_direct', 'reward_umbrella'])
+                ->count();
+            if ($exists > 0) {
+                Log::info("[PointsReward] 订单 {$orderId} 已有积分奖励记录，跳过重复发放");
+                return;
+            }
+
             $buyer = $this->userDao->get($orderUid);
             if (!$buyer || !$buyer['spread_uid']) {
                 return;

pro_v3.5.1/app/services/order/StoreOrderTakeServices.php

@@ -276,10 +276,8 @@ class StoreOrderTakeServices extends BaseServices
         //订单中取出
         $brokeragePrice = $orderInfo['one_brokerage'] ?? 0;
 
-        // fsgx: 积分奖励独立于佣金金额，只要是报单订单且推荐人存在就触发
-        if ($isQueueOrder && $one_spread_uid > 0) {
-            $this->grantFrozenPointsByBrokerage($one_spread_uid, $brokeragePrice, $orderInfo);
-        }
+        // fsgx: 积分奖励已移至 HjfOrderPayJob（等级升级完成后触发），此处不再触发
+        // 避免推荐人升级前 grade=0 导致积分被跳过的时序问题
 
         // 返佣金额小于等于0 直接返回不返佣金
         if ($brokeragePrice <= 0) {

pro_v3.5.1/app/services/user/UserServices.php

@@ -2533,9 +2533,12 @@ class UserServices extends BaseServices
         }
         $spread_one_ids = $this->getUserSpredadUids($uid, 1);
         $spread_two_ids = $this->getUserSpredadUids($uid, 2);
+        /** @var \app\services\hjf\MemberLevelServices $memberLevelServices */
+        $memberLevelServices = app()->make(\app\services\hjf\MemberLevelServices::class);
         $data = [
             'total' => count($spread_one_ids),
             'totalLevel' => count($spread_two_ids),
+            'umbrellaCount' => $memberLevelServices->getUmbrellaMemberCount($uid),
             'list' => []
         ];
         /** @var UserStoreOrderServices $userStoreOrder */
@@ -2556,6 +2559,7 @@ class UserServices extends BaseServices
         }
         $data['list'] = $list;
         $data['brokerage_level'] = (int)sys_config('brokerage_level', 2);
+        $data['umbrellaOrderCount'] = $memberLevelServices->getUmbrellaQueueOrderCount($uid);
         $data['count'] = 0;
         $data['price'] = 0;
         $data['order_count'] = 0;