feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -71,8 +71,8 @@ class Order
|
||||
return false;
|
||||
}
|
||||
|
||||
// 是否自购分销订单
|
||||
$this->selfBuy = $this->buyer->isAgentAvaliable() && $this->config->isSelfBuy();
|
||||
// 是否自购分销订单(收益中心模式或开启自购时,分销商本人订单均记为自购订单以累积团队业绩)
|
||||
$this->selfBuy = $this->buyer->isAgentAvaliable() && ($this->config->isSelfBuy() || boolval(sheep_config('shop.commission.partner_mode')));
|
||||
|
||||
// 未找到上级分销商且不是自购
|
||||
if (!$this->buyer->getParentUserId() && !$this->selfBuy) {
|
||||
@@ -202,7 +202,7 @@ class Order
|
||||
'buyer_id' => $commissionOrder->buyer_id, // 购买人
|
||||
'commission_order_id' => $commissionOrder->id, // 分销订单ID
|
||||
'agent_id' => $currentAgent->user->id, // 待分佣分销商ID
|
||||
'type' => 'commission', // 奖金类型
|
||||
'type' => \addons\shopro\service\partner\PartnerConfig::rewardWalletType(), // 奖金类型
|
||||
'commission' => $commission, // 佣金
|
||||
'status' => 0, // 佣金状态
|
||||
'original_commission' => $commission, // 原始佣金
|
||||
|
||||
在新工单中引用
屏蔽一个用户