修复翻译BUG
This commit is contained in:
@@ -87,6 +87,8 @@ return [
|
||||
'推送-用户私有频道' => 'Push: user private',
|
||||
'渠道管理' => 'Channel management',
|
||||
'管理员提现记录' => 'Admin withdraw records',
|
||||
'管理员钱包' => 'Admin wallets',
|
||||
'管理员钱包流水' => 'Admin wallet records',
|
||||
'一键批量结算待结算渠道' => 'Batch settle pending channels',
|
||||
'渠道结算统计' => 'Channel settlement statistics',
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ class ChannelSettlementService
|
||||
return ['ok' => false, 'msg' => '当前流程为超管结算后自动发放,渠道管理员无需二次结算'];
|
||||
}
|
||||
|
||||
public static function settleAllDueChannels(int $operatorAdminId): array
|
||||
public static function settleAllDueChannels(int $operatorAdminId, bool $respectCycle = true): array
|
||||
{
|
||||
$channels = Db::name('channel')->where('status', 1)->select()->toArray();
|
||||
$ok = 0;
|
||||
@@ -106,7 +106,7 @@ class ChannelSettlementService
|
||||
if ($channelId <= 0) {
|
||||
continue;
|
||||
}
|
||||
if (!self::isChannelDueForAutoSettle($channel, $now)) {
|
||||
if ($respectCycle && !self::isChannelDueForAutoSettle($channel, $now)) {
|
||||
continue;
|
||||
}
|
||||
$res = self::settleBySuperAdmin($channelId, $operatorAdminId, '周期自动结算', true);
|
||||
|
||||
Reference in New Issue
Block a user