1.结算记录中新增结算信息
2.优化渠道页面样式
This commit is contained in:
@@ -194,6 +194,14 @@ class AdminCommissionDistributionService
|
||||
if ($nodes === []) {
|
||||
return [];
|
||||
}
|
||||
$shareRateByAdmin = [];
|
||||
foreach ($nodes as $node) {
|
||||
$nodeAdminId = intval($node['admin_id'] ?? 0);
|
||||
if ($nodeAdminId <= 0) {
|
||||
continue;
|
||||
}
|
||||
$shareRateByAdmin[$nodeAdminId] = strval($node['share_rate'] ?? '0.00');
|
||||
}
|
||||
$defaultRate = self::normalizeHandlingFeeRatePercent($defaultHandlingFeeRate);
|
||||
$merged = [];
|
||||
foreach ($nodes as $node) {
|
||||
@@ -223,6 +231,7 @@ class AdminCommissionDistributionService
|
||||
'commission_amount' => $gross,
|
||||
'commission_rate' => $effectiveRate,
|
||||
'calc_base_amount' => $settlementBase,
|
||||
'share_rate' => $shareRateByAdmin[$adminId] ?? '0.00',
|
||||
'commission_share_percent' => self::calcCommissionSharePercent($gross, $totalCommission),
|
||||
'handling_fee_rate' => $feeRate,
|
||||
'handling_fee' => $feeAmount,
|
||||
|
||||
@@ -73,7 +73,6 @@ class ChannelSettlementService
|
||||
if ($adminId <= 0) {
|
||||
continue;
|
||||
}
|
||||
unset($row['net_commission_amount']);
|
||||
$row['status'] = 1;
|
||||
$row['settled_at'] = $now;
|
||||
$row['remark'] = strval($row['remark'] ?? '') . ' | 超管结算直接发放';
|
||||
@@ -370,9 +369,12 @@ class ChannelSettlementService
|
||||
'channel_id' => $channelId,
|
||||
'admin_id' => $adminId,
|
||||
'commission_rate' => strval($dist['commission_rate'] ?? '0.0000'),
|
||||
'share_rate' => strval($dist['share_rate'] ?? '0.00'),
|
||||
'calc_base_amount' => strval($dist['calc_base_amount'] ?? '0.00'),
|
||||
'commission_amount' => $amount,
|
||||
'commission_share_percent' => strval($dist['commission_share_percent'] ?? '0.00'),
|
||||
'handling_fee' => strval($dist['handling_fee'] ?? '0.00'),
|
||||
'handling_fee_rate' => strval($dist['handling_fee_rate'] ?? '0.00'),
|
||||
'net_commission_amount' => strval($dist['net_commission_amount'] ?? '0.00'),
|
||||
'status' => 0,
|
||||
'settled_at' => null,
|
||||
|
||||
Reference in New Issue
Block a user