b5142ff780
feat(commission): 完善分销订单支付时数据同步机制 - 新增 syncExistingCommissionOrderOnPay 方法处理已存在分销单的支付同步场景 - 添加 encodeCommissionRulesSnapshot 和 commissionRulesSnapshotEquals 辅助方法 - 优化佣金规则快照存储方式，统一JSON编码格式 - 增加已入账奖励数量检查，防止对已结算订单进行错误同步 fix(wallet-settlement): 调整分账和佣金结算的余额处理逻辑 - 新增 shouldSettleCommissionViaWalletHook 和 shouldSettleRegionalViaWalletHook 方法控制分账成功后的钱包入账行为 - 修改 shouldDeferRegionalWallet 调用为 shouldSettleRegionalViaWalletHook - 修复分账成功时仍可能重复入钱包的问题 - 统一佣金和区域代理的钩子结算判断逻辑 refactor(hook): 优化佣金钩子触发条件和订单查询逻辑 - 在 CommissionHook 中使用新的钱包结算判断方法 - 修正 orderFinish 事件中的订单项遍历逻辑 - 增加订单有效性检查，避免空值异常 - 统一各事件中的结算条件判断 test(sql): 更新分账佣金验证SQL脚本 - 修正注释说明，明确分账成功不入余额的控制逻辑 - 补充区域代理佣金缺失汇付接收方的查询 - 重构单笔订单深度核验脚本，提供更详细的订单分析信息 - 增加分账成功与钱包流水的对比检查逻辑 ```
352 行
13 KiB
PHP
352 行
13 KiB
PHP
<?php
|
||
|
||
namespace addons\shopro\library\split;
|
||
|
||
use addons\shopro\library\commission\Config as CommissionConfig;
|
||
use addons\shopro\library\commission\Reward as CommissionRewardLibrary;
|
||
use addons\shopro\library\regional_agent\Config as RegionalConfig;
|
||
use addons\shopro\library\regional_agent\Reward as RegionalRewardLibrary;
|
||
use addons\shopro\model\Order;
|
||
use addons\shopro\model\commission\Order as CommissionOrderModel;
|
||
use addons\shopro\model\commission\Reward as CommissionRewardModel;
|
||
use addons\shopro\model\regional_agent\Order as RegionalOrderModel;
|
||
use addons\shopro\model\regional_agent\Reward as RegionalRewardModel;
|
||
use addons\shopro\model\split\Receiver;
|
||
use addons\shopro\model\split\SplitOrder;
|
||
use addons\shopro\model\split\SplitOrderReceiver;
|
||
|
||
/**
|
||
* 支付通道分账与钱包佣金：汇付可按人混合（已进件走通道、未进件进钱包）；其它通道整单成功则不入余额
|
||
*/
|
||
class SplitWalletSettlement
|
||
{
|
||
public static function shouldDeferCommissionWallet($order, $event)
|
||
{
|
||
$commissionEvent = (new CommissionConfig())->getCommissionEvent();
|
||
if ($commissionEvent !== $event && $event !== 'admin') {
|
||
return false;
|
||
}
|
||
return self::shouldDeferWalletUntilGatewaySplitResolves($order);
|
||
}
|
||
|
||
public static function shouldDeferRegionalWallet($order, $event)
|
||
{
|
||
$regionalEvent = (new RegionalConfig())->getCommissionEvent();
|
||
if ($regionalEvent !== $event && $event !== 'admin') {
|
||
return false;
|
||
}
|
||
return self::shouldDeferWalletUntilGatewaySplitResolves($order);
|
||
}
|
||
|
||
/**
|
||
* 分销钩子是否应把待发佣金写入余额（false = 等分账 finalize 或已走通道，避免与汇付/微信分账重复）
|
||
*/
|
||
public static function shouldSettleCommissionViaWalletHook($order, $event)
|
||
{
|
||
$commissionEvent = (new CommissionConfig())->getCommissionEvent();
|
||
if ($commissionEvent !== $event && $event !== 'admin') {
|
||
return false;
|
||
}
|
||
if (self::shouldDeferWalletUntilGatewaySplitResolves($order)) {
|
||
return false;
|
||
}
|
||
|
||
return true;
|
||
}
|
||
|
||
/**
|
||
* 区域代理钩子是否应把待发佣金写入余额
|
||
*/
|
||
public static function shouldSettleRegionalViaWalletHook($order, $event)
|
||
{
|
||
$regionalEvent = (new RegionalConfig())->getCommissionEvent();
|
||
if ($regionalEvent !== $event && $event !== 'admin') {
|
||
return false;
|
||
}
|
||
if (self::shouldDeferWalletUntilGatewaySplitResolves($order)) {
|
||
return false;
|
||
}
|
||
|
||
return true;
|
||
}
|
||
|
||
/**
|
||
* 分销/区域结算事件（如 payed）早于 split_timing（如 confirm）时，仍应等分账结束再入钱包
|
||
*/
|
||
protected static function shouldDeferWalletUntilGatewaySplitResolves($order)
|
||
{
|
||
if (is_numeric($order)) {
|
||
$order = Order::get($order);
|
||
}
|
||
if (!$order) {
|
||
return false;
|
||
}
|
||
|
||
$config = new Config();
|
||
if (!$config->isEnable() || !$config->shouldSkipWallet()) {
|
||
return false;
|
||
}
|
||
// 分账已成功：佣金应由 finalizeAfterSplitAttempt 处理（或已标记通道到账），钩子不得再入余额
|
||
if (self::isSplitSuccessful($order['id'])) {
|
||
return true;
|
||
}
|
||
|
||
if (class_exists('\\addons\\shopro_huifu\\library\\Bridge')
|
||
&& \addons\shopro_huifu\library\Bridge::shouldHandleSplit($order)) {
|
||
return true;
|
||
}
|
||
|
||
if (in_array($config->getMode(), ['wechat', 'both'], true) && $order['pay_type'] === 'wechat') {
|
||
return true;
|
||
}
|
||
|
||
return false;
|
||
}
|
||
|
||
/**
|
||
* 当前订单是否应等分账结果再决定钱包入账
|
||
*/
|
||
public static function shouldDeferForGatewaySplit($order, $event)
|
||
{
|
||
if (is_numeric($order)) {
|
||
$order = Order::get($order);
|
||
}
|
||
if (!$order) {
|
||
return false;
|
||
}
|
||
|
||
$config = new Config();
|
||
if (!$config->isEnable() || !$config->shouldSkipWallet()) {
|
||
return false;
|
||
}
|
||
if ($config->getTiming() !== $event) {
|
||
return false;
|
||
}
|
||
|
||
if (class_exists('\\addons\\shopro_huifu\\library\\Bridge')
|
||
&& \addons\shopro_huifu\library\Bridge::shouldHandleSplit($order)) {
|
||
return true;
|
||
}
|
||
|
||
if (in_array($config->getMode(), ['wechat', 'both'], true) && $order['pay_type'] === 'wechat') {
|
||
return true;
|
||
}
|
||
|
||
return false;
|
||
}
|
||
|
||
public static function isSplitSuccessful($orderId)
|
||
{
|
||
return SplitOrder::where('order_id', $orderId)
|
||
->where('status', 'in', [2, 3])
|
||
->count() > 0;
|
||
}
|
||
|
||
/**
|
||
* 分账尝试结束后结算佣金（汇付成功=按人混合；其它成功=整单不入钱包；失败=整单入钱包）
|
||
*/
|
||
public static function finalizeAfterSplitAttempt($orderId, $event, $splitExecutedOk = false)
|
||
{
|
||
if (!self::shouldDeferForGatewaySplit($orderId, $event)) {
|
||
return;
|
||
}
|
||
|
||
if (self::isSplitSuccessful($orderId)) {
|
||
if (self::shouldSettleHuifuPerReceiver($orderId)) {
|
||
self::settleOrderHybridHuifuGatewayAndWallet($orderId, $event);
|
||
} else {
|
||
self::settleOrderWithoutWallet($orderId, $event);
|
||
}
|
||
} else {
|
||
self::settleOrderToWallet($orderId, $event);
|
||
}
|
||
}
|
||
|
||
/**
|
||
* 汇付延时分账：仅出现在分账明细中的推广员/区域公司视为通道已分，其余佣金进钱包
|
||
*/
|
||
public static function settleOrderHybridHuifuGatewayAndWallet($orderId, $event)
|
||
{
|
||
$gateway = self::collectGatewaySplitUserIds($orderId);
|
||
|
||
$commissionLib = new CommissionRewardLibrary();
|
||
$commissionOrders = CommissionOrderModel::where('order_id', $orderId)
|
||
->where('commission_reward_status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
|
||
->select();
|
||
foreach ($commissionOrders as $commissionOrder) {
|
||
if ($commissionOrder['commission_event'] !== $event && $event !== 'admin') {
|
||
continue;
|
||
}
|
||
$rewards = CommissionRewardModel::where('commission_order_id', $commissionOrder['id'])
|
||
->where('status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
|
||
->select();
|
||
foreach ($rewards as $reward) {
|
||
$userId = (int) $reward['agent_id'];
|
||
if ($userId > 0 && in_array($userId, $gateway['promoter'], true)) {
|
||
$commissionLib->runCommissionRewardWithoutWallet($event, $reward);
|
||
} else {
|
||
$commissionLib->runCommissionReward($event, $reward);
|
||
}
|
||
}
|
||
self::markCommissionOrderSettledIfDone($commissionOrder);
|
||
}
|
||
|
||
$regionalLib = new RegionalRewardLibrary();
|
||
$regionalOrders = RegionalOrderModel::where('order_id', $orderId)
|
||
->where('commission_reward_status', RegionalRewardLibrary::STATUS_WAITING)
|
||
->select();
|
||
foreach ($regionalOrders as $regionalOrder) {
|
||
if ($regionalOrder['commission_event'] !== $event) {
|
||
continue;
|
||
}
|
||
$rewards = RegionalRewardModel::where('regional_order_id', $regionalOrder['id'])
|
||
->where('status', RegionalRewardLibrary::STATUS_WAITING)
|
||
->select();
|
||
foreach ($rewards as $reward) {
|
||
$userId = (int) $reward['agent_user_id'];
|
||
if ($userId > 0 && in_array($userId, $gateway['regional_agent'], true)) {
|
||
$regionalLib->settleRewardWithoutWallet($reward, $event);
|
||
} else {
|
||
$regionalLib->settleReward($reward, $event);
|
||
}
|
||
}
|
||
self::markRegionalOrderSettledIfDone($regionalOrder);
|
||
}
|
||
}
|
||
|
||
protected static function shouldSettleHuifuPerReceiver($orderId)
|
||
{
|
||
$order = Order::get($orderId);
|
||
if (!$order) {
|
||
return false;
|
||
}
|
||
return class_exists('\\addons\\shopro_huifu\\library\\Bridge')
|
||
&& \addons\shopro_huifu\library\Bridge::shouldHandleSplit($order);
|
||
}
|
||
|
||
/**
|
||
* @return array{promoter:int[],regional_agent:int[]}
|
||
*/
|
||
protected static function collectGatewaySplitUserIds($orderId)
|
||
{
|
||
$promoter = [];
|
||
$regional = [];
|
||
|
||
$splitOrder = SplitOrder::where('order_id', $orderId)
|
||
->where('status', 'in', [2, 3])
|
||
->order('id', 'desc')
|
||
->find();
|
||
if (!$splitOrder) {
|
||
return ['promoter' => [], 'regional_agent' => []];
|
||
}
|
||
|
||
$rows = SplitOrderReceiver::where('split_order_id', $splitOrder['id'])->select();
|
||
foreach ($rows as $row) {
|
||
$roleType = (string) ($row['role_type'] ?? '');
|
||
if (!in_array($roleType, ['promoter', 'regional_agent'], true)) {
|
||
continue;
|
||
}
|
||
$receiverId = (int) ($row['receiver_id'] ?? 0);
|
||
if ($receiverId <= 0) {
|
||
continue;
|
||
}
|
||
$receiver = Receiver::get($receiverId);
|
||
if (!$receiver) {
|
||
continue;
|
||
}
|
||
$roleUserId = (int) ($receiver['role_id'] ?? 0);
|
||
if ($roleUserId <= 0) {
|
||
continue;
|
||
}
|
||
if ($roleType === 'promoter') {
|
||
$promoter[$roleUserId] = $roleUserId;
|
||
} else {
|
||
$regional[$roleUserId] = $roleUserId;
|
||
}
|
||
}
|
||
|
||
return [
|
||
'promoter' => array_values($promoter),
|
||
'regional_agent' => array_values($regional),
|
||
];
|
||
}
|
||
|
||
protected static function markCommissionOrderSettledIfDone($commissionOrder)
|
||
{
|
||
$waiting = CommissionRewardModel::where('commission_order_id', $commissionOrder['id'])
|
||
->where('status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
|
||
->count();
|
||
if ($waiting > 0) {
|
||
return;
|
||
}
|
||
if ($commissionOrder['commission_reward_status'] !== CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING) {
|
||
return;
|
||
}
|
||
$commissionOrder->commission_reward_status = CommissionRewardLibrary::COMMISSION_REWARD_STATUS_ACCOUNTED;
|
||
$commissionOrder->commission_time = time();
|
||
$commissionOrder->save();
|
||
}
|
||
|
||
protected static function markRegionalOrderSettledIfDone($regionalOrder)
|
||
{
|
||
$waiting = RegionalRewardModel::where('regional_order_id', $regionalOrder['id'])
|
||
->where('status', RegionalRewardLibrary::STATUS_WAITING)
|
||
->count();
|
||
if ($waiting > 0) {
|
||
return;
|
||
}
|
||
if ($regionalOrder['commission_reward_status'] !== RegionalRewardLibrary::STATUS_WAITING) {
|
||
return;
|
||
}
|
||
$regionalOrder->commission_reward_status = RegionalRewardLibrary::STATUS_ACCOUNTED;
|
||
$regionalOrder->commission_time = time();
|
||
$regionalOrder->save();
|
||
}
|
||
|
||
public static function settleOrderWithoutWallet($orderId, $event)
|
||
{
|
||
$commissionLib = new CommissionRewardLibrary();
|
||
$commissionOrders = CommissionOrderModel::where('order_id', $orderId)
|
||
->where('commission_reward_status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
|
||
->select();
|
||
foreach ($commissionOrders as $commissionOrder) {
|
||
if ($commissionOrder['commission_event'] === $event || $event === 'admin') {
|
||
$commissionLib->runCommissionRewardByOrderWithoutWallet($event, $commissionOrder);
|
||
}
|
||
}
|
||
|
||
$regionalLib = new RegionalRewardLibrary();
|
||
$regionalOrders = RegionalOrderModel::where('order_id', $orderId)
|
||
->where('commission_reward_status', RegionalRewardLibrary::STATUS_WAITING)
|
||
->select();
|
||
foreach ($regionalOrders as $regionalOrder) {
|
||
if ($regionalOrder['commission_event'] === $event) {
|
||
$regionalLib->settleByRegionalOrderWithoutWallet($regionalOrder->id, $event);
|
||
}
|
||
}
|
||
}
|
||
|
||
public static function settleOrderToWallet($orderId, $event)
|
||
{
|
||
$commissionLib = new CommissionRewardLibrary();
|
||
$commissionOrders = CommissionOrderModel::where('order_id', $orderId)
|
||
->where('commission_reward_status', CommissionRewardLibrary::COMMISSION_REWARD_STATUS_WAITING)
|
||
->select();
|
||
foreach ($commissionOrders as $commissionOrder) {
|
||
if ($commissionOrder['commission_event'] === $event || $event === 'admin') {
|
||
$commissionLib->runCommissionRewardByOrder($event, $commissionOrder);
|
||
}
|
||
}
|
||
|
||
$regionalLib = new RegionalRewardLibrary();
|
||
$regionalOrders = RegionalOrderModel::where('order_id', $orderId)
|
||
->where('commission_reward_status', RegionalRewardLibrary::STATUS_WAITING)
|
||
->select();
|
||
foreach ($regionalOrders as $regionalOrder) {
|
||
if ($regionalOrder['commission_event'] === $event) {
|
||
$regionalLib->settleByRegionalOrder($regionalOrder->id, $event);
|
||
}
|
||
}
|
||
}
|
||
}
|