mojiahui/webman-buildadmin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对搜索返回的消息做中英双版本

Browse Source
This commit is contained in:
zhenhui
2026-04-28 15:22:50 +08:00
parent 85133ee92b
commit 9bc439ea5e
32 changed files with 575 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/admin/controller/Channel.php
View File

@@ -574,7 +574,7 @@ class Channel extends Backend
}
$rowsRaw = $request->post('list', []);
if (!is_array($rowsRaw) || $rowsRaw === []) {
return $this->error('请至少配置一条分配记录');
return $this->error(__('Please configure at least one share record'));
}
$adminIds = Db::name('admin')
@@ -585,7 +585,7 @@ class Channel extends Backend
$adminIdSet[(int) $adminId] = true;
}
if ($adminIdSet === []) {
return $this->error('该渠道下暂无管理员，无法配置分配比例');
return $this->error(__('There are no admins under this channel; cannot configure share ratios'));
}
$enabledSum = '0.00';
@@ -602,7 +602,7 @@ class Channel extends Backend
$shareRaw = $line['share_rate'] ?? null;
$shareRate = self::normalizeAmountScale($shareRaw === null ? '0' : (string) $shareRaw, 2);
if (bccomp($shareRate, '0', 2) < 0 || bccomp($shareRate, '100', 2) > 0) {
return $this->error('分配比例必须在0到100之间');
return $this->error(__('Share ratio must be between 0 and 100'));
}
if ($status === 1) {
$enabledSum = bcadd($enabledSum, $shareRate, 2);
@@ -617,10 +617,10 @@ class Channel extends Backend
];
}
if ($insertRows === []) {
return $this->error('请至少配置一条有效分配记录');
return $this->error(__('Please configure at least one valid share record'));
}
if (bccomp($enabledSum, '100.00', 2) !== 0) {
return $this->error('启用的分配比例总和必须等于100');
return $this->error(__('Sum of enabled share ratios must equal 100'));
}
Db::startTrans();
@@ -633,7 +633,7 @@ class Channel extends Backend
return $this->error($e->getMessage());
}
return $this->success('分配比例保存成功');
return $this->success(__('Share ratios saved successfully'));
}
/**
@@ -646,7 +646,7 @@ class Channel extends Backend
return $response;
}
if (!$this->auth->isSuperAdmin()) {
return $this->error('仅超管可执行结算，结算后系统会自动发放至管理员钱包');
return $this->error(__('Only super admin can settle; after settlement, commissions will be automatically paid to admin wallets'));
}
$id = (int) ($request->post('id', $request->get('id', 0)));
@@ -665,9 +665,9 @@ class Channel extends Backend
$res = ChannelSettlementService::settleBySuperAdmin((int) $row['id'], intval($this->auth->id), $remark, false);
if (($res['ok'] ?? false) !== true) {
return $this->error((string) ($res['msg'] ?? '结算失败'));
return $this->error((string) ($res['msg'] ?? __('Settlement failed')));
}
return $this->success('超管结算完成，已按分配比例自动发放给管理员');
return $this->success(__('Super admin settlement completed; paid automatically by share ratios'));
}
/**
@@ -684,7 +684,7 @@ class Channel extends Backend
}
// 批量按钮语义：手动触发“待结算渠道”结算，不受结算周期到点限制。
$res = ChannelSettlementService::settleAllDueChannels(intval($this->auth->id), false);
return $this->success('批量结算完成', $res);
return $this->success(__('Batch settlement completed'), $res);
}
/**
@@ -738,7 +738,7 @@ class Channel extends Backend
{
$channelId = (int) ($row['id'] ?? 0);
if ($channelId <= 0) {
return '渠道数据异常';
return (string) __('Invalid channel data');
}
$endTs = time();
@@ -751,7 +751,7 @@ class Channel extends Backend
}
if ($periodStartTs >= $endTs) {
return '结算区间无效（开始时间不早于当前）';
return (string) __('Invalid settlement period (start time is not earlier than now)');
}
$stats = $this->aggregateBetOrderForChannel($channelId, $periodStartTs, $lastEnd !== null, $endTs);
@@ -864,7 +864,7 @@ class Channel extends Backend
if ($mode === 'turnover') {
$ratePercent = $row['turnover_share_rate'] ?? null;
if ($ratePercent === null || $ratePercent === '') {
return '普通返水代理未配置返水分红比例';
return (string) __('Turnover agent commission rate is not configured');
}
$rateDec = bcdiv((string) $ratePercent, '100', 2);
$amount = bcmul($totalBet, $rateDec, 2);
@@ -879,11 +879,11 @@ class Channel extends Backend
$fee = $row['affiliate_fee_rate'] ?? null;
$rulesRaw = $row['affiliate_ladder_rules'] ?? null;
if ($fee === null || $fee === '') {
return '联营代理未配置成本扣除比例';
return (string) __('Affiliate agent fee rate is not configured');
}
$rules = $this->normalizeLadderRulesForSettlement($rulesRaw);
if ($rules === []) {
return '联营阶梯规则无效或为空';
return (string) __('Affiliate ladder rules are empty or invalid');
}
if (bccomp($platformProfit, '0', 2) <= 0) {
@@ -915,7 +915,7 @@ class Channel extends Backend
];
}
return '未知的代理模式';
return (string) __('Unknown agent mode');
}
/**
@@ -1169,20 +1169,20 @@ class Channel extends Backend
{
$cycle = isset($data['settle_cycle']) ? trim((string) $data['settle_cycle']) : 'weekly';
if (!in_array($cycle, ['daily', 'weekly', 'monthly'], true)) {
return '结算周期不合法';
return (string) __('Invalid settlement cycle');
}
$data['settle_cycle'] = $cycle;
$settleTime = isset($data['settle_time']) ? trim((string) $data['settle_time']) : '02:00:00';
if (!preg_match('/^\d{2}:\d{2}:\d{2}$/', $settleTime)) {
return '结算时间格式不正确（HH:mm:ss）';
return (string) __('Invalid settlement time format (HH:mm:ss)');
}
$data['settle_time'] = $settleTime;
if ($cycle === 'weekly') {
$weekday = isset($data['settle_weekday']) ? (int) $data['settle_weekday'] : 1;
if ($weekday < 1 || $weekday > 7) {
return '周结必须选择周一到周日';
return (string) __('Weekly settlement must select Monday to Sunday');
}
$data['settle_weekday'] = $weekday;
} else {
@@ -1192,7 +1192,7 @@ class Channel extends Backend
if ($cycle === 'monthly') {
$monthday = isset($data['settle_monthday']) ? (int) $data['settle_monthday'] : 1;
if ($monthday < 1 || $monthday > 31) {
return '月结日期必须在1到31之间';
return (string) __('Monthly settlement day must be between 1 and 31');
}
$data['settle_monthday'] = $monthday;
} else {
@@ -1204,7 +1204,7 @@ class Channel extends Backend
if (isset($data['turnover_share_rate']) && $data['turnover_share_rate'] !== '' && $data['turnover_share_rate'] !== null) {
$num = (float) $data['turnover_share_rate'];
if ($num < 0 || $num > 100) {
return '返水分红比例必须在0到100之间';
return (string) __('Turnover commission rate must be between 0 and 100');
}
}
return null;
@@ -1213,11 +1213,11 @@ class Channel extends Backend
if ($mode === 'affiliate') {
foreach (['affiliate_share_rate' => '联营占成比例', 'affiliate_fee_rate' => '联营成本扣除比例'] as $field => $label) {
if (!isset($data[$field]) || $data[$field] === '' || $data[$field] === null) {
return $label . '不能为空';
return (string) __('Affiliate share/fee rates are required');
}
$num = (float) $data[$field];
if ($num < 0 || $num > 1) {
return $label . '必须在0到1之间';
return (string) __('Affiliate share/fee rates must be between 0 and 1');
}
}
$ladderErr = $this->validateLadderRulesField($data);
@@ -1262,45 +1262,45 @@ class Channel extends Backend
{
$rulesRaw = $data['affiliate_ladder_rules'] ?? null;
if ($rulesRaw === null || $rulesRaw === '') {
return '联营阶梯规则不能为空';
return (string) __('Affiliate ladder rules are required');
}
if (is_string($rulesRaw)) {
$decoded = json_decode($rulesRaw, true);
if (!is_array($decoded)) {
return '联营阶梯规则必须是有效JSON数组';
return (string) __('Affiliate ladder rules must be a valid JSON array');
}
$rulesRaw = $decoded;
}
if (!is_array($rulesRaw) || $rulesRaw === []) {
return '联营阶梯规则至少需要一条';
return (string) __('Affiliate ladder rules must contain at least one row');
}
$normalized = [];
$prevMinLoss = null;
foreach ($rulesRaw as $idx => $rule) {
if (!is_array($rule)) {
return '联营阶梯规则第' . ($idx + 1) . '行格式错误';
return (string) __('Affiliate ladder rules row format error') . ' #' . ($idx + 1);
}
$minLoss = $rule['minLoss'] ?? ($rule['min_loss'] ?? null);
$shareRate = $rule['shareRate'] ?? ($rule['share_rate'] ?? null);
if ($minLoss === null || $minLoss === '' || !is_numeric((string) $minLoss)) {
return '联营阶梯规则第' . ($idx + 1) . '行起始客损格式错误';
return (string) __('Affiliate ladder rules minLoss format error') . ' #' . ($idx + 1);
}
if ($shareRate === null || $shareRate === '' || !is_numeric((string) $shareRate)) {
return '联营阶梯规则第' . ($idx + 1) . '行占成比例格式错误';
return (string) __('Affiliate ladder rules shareRate format error') . ' #' . ($idx + 1);
}
$minLossNum = (float) $minLoss;
$shareRateNum = (float) $shareRate;
if ($minLossNum < 0) {
return '联营阶梯规则第' . ($idx + 1) . '行起始客损不能为负';
return (string) __('Affiliate ladder rules minLoss cannot be negative') . ' #' . ($idx + 1);
}
if ($shareRateNum < 0 || $shareRateNum > 1) {
return '联营阶梯规则第' . ($idx + 1) . '行占成比例必须在0到1之间';
return (string) __('Affiliate ladder rules shareRate must be between 0 and 1') . ' #' . ($idx + 1);
}
if ($prevMinLoss !== null && $minLossNum <= $prevMinLoss) {
return '联营阶梯规则需按起始客损递增';
return (string) __('Affiliate ladder rules must be strictly increasing by minLoss');
}
$prevMinLoss = $minLossNum;
$normalized[] = [