Merge branch 'feature/fsgx' into queue
Made-with: Cursor
This commit is contained in:
apple
@@ -62,32 +62,51 @@ class PointsRewardServices extends BaseServices
|
||||
if (!$buyer || !$buyer['spread_uid']) {
|
||||
return;
|
||||
}
|
||||
$this->propagateReward($buyer['spread_uid'], $orderUid, $orderId, 0, 0, $orderDbId, $preUpgradeLevels, $qty);
|
||||
|
||||
// 取买家自身的直推奖励积分作为级差下限，确保第一级父节点只拿差额
|
||||
$buyerLevelId = array_key_exists($orderUid, $preUpgradeLevels)
|
||||
? $preUpgradeLevels[$orderUid]
|
||||
: (int)($buyer['agent_level'] ?? 0);
|
||||
$buyerDirectReward = $this->agentLevelServices->getDirectRewardPoints($buyerLevelId);
|
||||
|
||||
$this->propagateReward((int)$buyer['spread_uid'], $orderUid, $orderId, $buyerDirectReward, 0, $orderDbId, $preUpgradeLevels, $qty);
|
||||
} catch (\Throwable $e) {
|
||||
Log::error("[PointsReward] 积分奖励失败 orderUid={$orderUid} orderId={$orderId}: " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 向上递归发放级差积分
|
||||
* 向上递归发放直推积分奖励（标准逐级级差）
|
||||
*
|
||||
* @param int $uid 当前被奖励用户
|
||||
* @param int $fromUid 触发方（下级）用户 ID
|
||||
* @param string $orderId 来源订单号
|
||||
* @param int $lowerReward 下级已获得的伞下奖励积分（用于级差扣减）
|
||||
* @param int $depth 递归深度
|
||||
* @param array $preUpgradeLevels 升级前各用户的 agent_level 快照 [uid => level_id]
|
||||
* @param int $qty 报单商品数量，积分按数量倍乘（B3）
|
||||
* 算法：沿推荐链向上遍历，每个分销等级大于0的祖先获得
|
||||
* max(0, 自身 direct_reward_points - 链中已见最高 direct_reward_points) * qty
|
||||
* 非分销员（grade=0）跳过但继续向上传递，$lowerDirectReward 不变。
|
||||
*
|
||||
* 直推关系约束（$directCascadeActive）：
|
||||
* 当买家直接推荐人（depth=0）不是分销员（grade=0）时，直推级差链终止，
|
||||
* 其所有上级祖先不得获得 reward_direct（不存在直推关系）。
|
||||
* 伞下奖励（reward_umbrella）不受此约束，仍按自身开关独立发放。
|
||||
*
|
||||
* @param int $uid 当前被奖励用户
|
||||
* @param int $fromUid 触发方（下级）用户 ID
|
||||
* @param string $orderId 来源订单号
|
||||
* @param int $lowerDirectReward 链中已被下级拿走的最高 direct_reward_points（级差下限）
|
||||
* @param int $depth 递归深度（防止无限递归）
|
||||
* @param int $orderDbId 订单表主键 id
|
||||
* @param array $preUpgradeLevels 升级前各用户的 agent_level 快照 [uid => level_id]（B2）
|
||||
* @param int $qty 报单商品数量，积分按数量倍乘（B3）
|
||||
* @param bool $directCascadeActive 直推级差链是否仍然有效
|
||||
*/
|
||||
private function propagateReward(
|
||||
int $uid,
|
||||
int $fromUid,
|
||||
string $orderId,
|
||||
int $lowerReward,
|
||||
int $lowerDirectReward,
|
||||
int $depth = 0,
|
||||
int $orderDbId = 0,
|
||||
array $preUpgradeLevels = [],
|
||||
int $qty = 1
|
||||
int $qty = 1,
|
||||
bool $directCascadeActive = true
|
||||
): void {
|
||||
if ($depth >= 10 || $uid <= 0) {
|
||||
return;
|
||||
@@ -105,48 +124,65 @@ class PointsRewardServices extends BaseServices
|
||||
$grade = $this->agentLevelServices->getGradeByLevelId($agentLevelId);
|
||||
|
||||
if ($grade === 0) {
|
||||
// 非分销员：跳过奖励，继续向上传递
|
||||
// 若当前节点是买家的直接推荐人（depth=0），直推级差链从此中断：
|
||||
// 上级祖先与买家之间没有直推关系，不应获得 reward_direct
|
||||
$nextCascadeActive = ($depth === 0) ? false : $directCascadeActive;
|
||||
if ($user['spread_uid']) {
|
||||
$this->propagateReward((int)$user['spread_uid'], $uid, $orderId, 0, $depth + 1, $orderDbId, $preUpgradeLevels, $qty);
|
||||
$this->propagateReward((int)$user['spread_uid'], $uid, $orderId, $lowerDirectReward, $depth + 1, $orderDbId, $preUpgradeLevels, $qty, $nextCascadeActive);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
$isDirect = ($depth === 0);
|
||||
// fsgx B4：直推奖励和伞下奖励分别读取，级差计算只用伞下奖励做扣减
|
||||
// 这样当中间层（如创客，umbrella=0）上报时，上级（云店，umbrella=300）
|
||||
// 计算 max(0, 300-0)=300，而不会被直推奖励 500 错误抵消
|
||||
$directReward = $this->agentLevelServices->getDirectRewardPoints($agentLevelId);
|
||||
$umbrellaReward = $this->agentLevelServices->getUmbrellaRewardPoints($agentLevelId);
|
||||
$directReward = $this->agentLevelServices->getDirectRewardPoints($agentLevelId);
|
||||
|
||||
if ($isDirect) {
|
||||
// fsgx B3：直推奖励按报单商品数量倍乘
|
||||
$actual = $directReward * $qty;
|
||||
} else {
|
||||
// 级差：基于单件奖励做差值，再乘以数量
|
||||
$actual = max(0, $umbrellaReward - $lowerReward) * $qty;
|
||||
// 直推级差：仅在直推链有效时发放（买家直接推荐人必须是分销员）
|
||||
if ($directCascadeActive) {
|
||||
$actual = max(0, $directReward - $lowerDirectReward) * $qty;
|
||||
if ($actual > 0) {
|
||||
$this->grantFrozenPoints(
|
||||
$uid,
|
||||
$actual,
|
||||
$orderId,
|
||||
'reward_direct',
|
||||
'直推奖励(级差)' . " x{$qty} - 来源订单 {$orderId}",
|
||||
$orderDbId
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if ($actual > 0) {
|
||||
$this->grantFrozenPoints(
|
||||
$uid,
|
||||
$actual,
|
||||
$orderId,
|
||||
$isDirect ? 'reward_direct' : 'reward_umbrella',
|
||||
($isDirect ? '直推奖励' : '伞下奖励(级差)') . " x{$qty} - 来源订单 {$orderId}",
|
||||
$orderDbId
|
||||
);
|
||||
// 伞下积分奖励：独立逻辑，仅对间接上级（depth>0）生效，受开关控制
|
||||
// 使用 umbrella_reward_points 平额发放（非级差），各等级独立拿自身额度
|
||||
if ($depth > 0) {
|
||||
$umbrellaRewardEnable = (int)sys_config('hjf_umbrella_reward_enable', 0);
|
||||
if ($umbrellaRewardEnable) {
|
||||
$umbrellaPoints = $this->agentLevelServices->getUmbrellaRewardPoints($agentLevelId);
|
||||
if ($umbrellaPoints > 0) {
|
||||
$this->grantFrozenPoints(
|
||||
$uid,
|
||||
$umbrellaPoints * $qty,
|
||||
$orderId,
|
||||
'reward_umbrella',
|
||||
'伞下奖励' . " x{$qty} - 来源订单 {$orderId}",
|
||||
$orderDbId
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 向上传递时，下限取当前节点与已有下限中的较大值，确保上级只拿增量
|
||||
$nextLower = max($directReward, $lowerDirectReward);
|
||||
if ($user['spread_uid']) {
|
||||
$this->propagateReward(
|
||||
(int)$user['spread_uid'],
|
||||
$uid,
|
||||
$orderId,
|
||||
$umbrellaReward, // 向上传单件伞下奖励（级差基数），让上级自行乘以 $qty
|
||||
$nextLower,
|
||||
$depth + 1,
|
||||
$orderDbId,
|
||||
$preUpgradeLevels,
|
||||
$qty
|
||||
$qty,
|
||||
$directCascadeActive
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user