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

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

Made-with: Cursor
This commit is contained in:
mac
2026-03-24 23:27:55 +08:00
parent 451918bc73
commit d0cd7e4667
8 changed files with 73 additions and 27 deletions

View File

@@ -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;
}
}