分账核验更新

这个提交包含在:
可乐加冰
2026-09-29 11:54:10 +08:00
父节点 0e513d7ecc
当前提交 10c35237b3
共有 2 个文件被更改,包括 9 次插入 和 10 次删除

查看文件

@@ -351,14 +351,14 @@ function diagnoseOrderSplitBlockers($orderId)
} }
if (empty($calcItems)) { if (empty($calcItems)) {
$reasons[] = 'SplitCalculator 结果为空(最常见:推广员/区域无 channel=huifu 的分账接收方)'; $reasons[] = 'SplitCalculator 结果为空(最常见:推广员/区域无 channel=huifu 的分账接收方)';
$rewards = Db::name('shopro_commission_reward')->alias('r') $rewards = Db::name('shopro_commission_reward')
->join('shopro_commission_agent a', 'a.id = r.agent_id') ->where('order_id', $orderId)
->where('r.order_id', $orderId) ->where('status', '>=', 0)
->where('r.status', '>=', 0) ->field('id, commission, agent_id')
->field('r.id, r.commission, a.user_id')
->select(); ->select();
foreach ($rewards as $rw) { foreach ($rewards as $rw) {
$uid = $rw['user_id']; // shopro_commission_agent 主键为 user_id,reward.agent_id 即分销商 user_id
$uid = intval($rw['agent_id']);
$recv = Db::name('shopro_split_receiver') $recv = Db::name('shopro_split_receiver')
->where('role_type', 'promoter') ->where('role_type', 'promoter')
->where('role_id', $uid) ->where('role_id', $uid)

查看文件

@@ -308,11 +308,10 @@ SELECT DISTINCT
sr.id AS split_receiver_id sr.id AS split_receiver_id
FROM fa_shopro_commission_reward r FROM fa_shopro_commission_reward r
INNER JOIN fa_shopro_order o ON o.id = r.order_id INNER JOIN fa_shopro_order o ON o.id = r.order_id
INNER JOIN fa_shopro_commission_agent a ON a.id = r.agent_id INNER JOIN fa_user u ON u.id = r.agent_id
INNER JOIN fa_user u ON u.id = a.user_id LEFT JOIN fa_shopro_huifu_onboard ho ON ho.user_id = r.agent_id AND ho.onboard_status = 'approved'
LEFT JOIN fa_shopro_huifu_onboard ho ON ho.user_id = a.user_id AND ho.onboard_status = 'approved'
LEFT JOIN fa_shopro_split_receiver sr ON sr.role_type = 'promoter' LEFT JOIN fa_shopro_split_receiver sr ON sr.role_type = 'promoter'
AND sr.role_id = a.user_id AND sr.channel = 'huifu' AND sr.status = 'normal' AND sr.role_id = r.agent_id AND sr.channel = 'huifu' AND sr.status = 'normal'
WHERE r.status >= 0 WHERE r.status >= 0
AND o.pay_type = 'huifu_wechat' AND o.pay_type = 'huifu_wechat'
AND o.paytime >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 90 DAY)) AND o.paytime >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 90 DAY))