feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -93,10 +93,14 @@ class Agent extends Common
|
||||
->where('reward_type', '<>', 'push3')
|
||||
->sum('amount');
|
||||
|
||||
$detail->income_total_cash = number_format((float) $totalCash, 2, '.', '');
|
||||
$alignedIncome = number_format(max(floatval($detail->total_income ?? 0), (float) $totalCash), 2, '.', '');
|
||||
$detail->income_total_cash = $alignedIncome;
|
||||
$detail->total_income = $alignedIncome;
|
||||
$detail->partner_cash_income = $alignedIncome;
|
||||
$detail->push3_cash_income = number_format((float) $push3Cash, 2, '.', '');
|
||||
$detail->partner_exclusive_cash = number_format((float) $partnerExclusiveCash, 2, '.', '');
|
||||
$detail->partner_cash_income = $detail->income_total_cash;
|
||||
$detail->user_money = number_format(floatval($detail->user ? $detail->user->money : 0), 2, '.', '');
|
||||
$detail->user_commission = number_format(floatval($detail->user ? $detail->user->commission : 0), 2, '.', '');
|
||||
$detail->partner_mode = \addons\shopro\service\partner\PartnerConfig::isPartnerMode() ? 1 : 0;
|
||||
$rate = (new \addons\shopro\service\partner\RateService())->currentRate();
|
||||
$detail->madow_value = \addons\shopro\service\partner\IdentityService::formatMoney((float) ($detail->madow ?? 0) * (float) $rate);
|
||||
|
||||
@@ -58,7 +58,7 @@ class Reward extends Common
|
||||
|
||||
$export = new \addons\shopro\library\Export();
|
||||
$params = [
|
||||
'file_name' => '佣金明细列表',
|
||||
'file_name' => '历史分销佣金列表',
|
||||
'cell_titles' => $cellTitles,
|
||||
'total' => $total,
|
||||
'is_sub_cell' => false,
|
||||
|
||||
在新工单中引用
屏蔽一个用户