refactor(fsgx): 积分奖励改为按 eb_agent_level 直推/伞下配置值发放

- grantFrozenPointsByBrokerage: 移除「比例×佣金」换算,改为委托
  PointsRewardServices::reward() 按 direct_reward_points /
  umbrella_reward_points 全链路发放 frozen_points
- HjfOrderPayJob: 移除重复的 PointsRewardServices::reward() 调用,
  避免同一笔订单双重发放;Job 仅保留公排入队与等级升级检查

Made-with: Cursor
This commit is contained in:
apple
2026-03-24 14:07:14 +08:00
parent f9ae632f33
commit b5cd96f92b
2 changed files with 26 additions and 41 deletions

View File

@@ -4,7 +4,6 @@ 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;
@@ -17,12 +16,14 @@ use think\facade\Log;
*
* 触发时机Pay 监听器检测到 is_queue_goods=1 时派发。
*
* 执行流程(改造复用版)
* 执行流程:
* 1. 调用 QueuePoolServices::enqueue() 将订单写入公排池
* 2. 调用 PointsRewardServices::reward() 沿推荐链发放级差积分
* 3. 调用 AgentLevelServices::checkUserLevelFinish() 检查升级
* 2. 调用 AgentLevelServices::checkUserLevelFinish() 检查升级
* (复用 CRMEB 分销等级升级流程,已支持 HJF 任务类型 6/7/8
*
* 注意:积分奖励(直推/伞下)由 StoreOrderTakeServices::grantFrozenPointsByBrokerage
* 在佣金发放时同步调用 PointsRewardServices::reward(),不在此 Job 中重复执行。
*
* Class HjfOrderPayJob
* @package app\jobs\hjf
*/
@@ -46,14 +47,8 @@ class HjfOrderPayJob extends BaseJobs
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());
}
// 注意积分奖励PointsRewardServices::reward已由 StoreOrderTakeServices::grantFrozenPointsByBrokerage
// 在佣金发放时同步调用,此处不再重复调用,避免双重发放 frozen_points。
try {
/** @var UserServices $userServices */