完善接口和后台页面

This commit is contained in:
2026-04-18 15:19:36 +08:00
parent a4878a9bbd
commit e3f26ba1f7
45 changed files with 3071 additions and 232 deletions

View File

@@ -0,0 +1,130 @@
<?php
namespace app\admin\controller\config;
use app\common\controller\Backend;
use app\common\library\game\DepositTier as DepositTierLib;
use InvalidArgumentException;
use support\think\Db;
use support\Response;
use Throwable;
use Webman\Http\Request as WebmanRequest;
/**
* 充值档位独立编辑(仅 game_config.deposit_tier
*/
class DepositTier extends Backend
{
protected bool $modelValidate = false;
protected array $noNeedPermission = ['index', 'save'];
private function hasNodePermission(WebmanRequest $request, string $action): bool
{
if (!$this->auth) {
return false;
}
$controllerPath = get_controller_path($request);
if (!$controllerPath) {
return false;
}
$paths = [];
$paths[] = $controllerPath . '/' . $action;
$parts = explode('/', $controllerPath);
foreach ($parts as &$part) {
if (str_contains($part, '_')) {
$part = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $part))));
}
}
$paths[] = implode('/', $parts) . '/' . $action;
foreach (array_values(array_unique($paths)) as $path) {
if ($this->auth->check($path)) {
return true;
}
}
return false;
}
protected function initController(WebmanRequest $request): ?Response
{
return null;
}
/**
* 读取 game_config.deposit_tier 的档位列表
*/
public function index(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if (!$this->hasNodePermission($request, 'index')) {
return $this->error(__('You have no permission'), [], 401);
}
if ($request->method() !== 'GET') {
return $this->error(__('Parameter error'));
}
$row = Db::name('game_config')->where('config_key', DepositTierLib::CONFIG_KEY)->find();
$items = DepositTierLib::parseFromConfigValue($row['config_value'] ?? null);
return $this->success('', [
'items' => $items,
]);
}
/**
* 保存 JSON 数组value_type=json
*/
public function save(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if (!$this->hasNodePermission($request, 'save')) {
return $this->error(__('You have no permission'), [], 401);
}
if ($request->method() !== 'POST') {
return $this->error(__('Parameter error'));
}
$payload = $request->post();
if (!is_array($payload)) {
return $this->error(__('Parameter %s can not be empty', ['']));
}
$items = $payload['items'] ?? null;
if (!is_array($items)) {
return $this->error('items 必须为数组');
}
try {
$clean = DepositTierLib::prepareItemsForSave(array_values($items));
$json = DepositTierLib::encodeForDb($clean);
} catch (InvalidArgumentException $e) {
return $this->error($e->getMessage());
}
$now = time();
try {
$exists = Db::name('game_config')->where('config_key', DepositTierLib::CONFIG_KEY)->find();
if ($exists) {
Db::name('game_config')->where('config_key', DepositTierLib::CONFIG_KEY)->update([
'config_value' => $json,
'value_type' => 'json',
'update_time' => $now,
]);
} else {
Db::name('game_config')->insert([
'config_key' => DepositTierLib::CONFIG_KEY,
'config_value' => $json,
'value_type' => 'json',
'remark' => '充值档位 JSON 数组(独立表单维护)',
'create_time' => $now,
'update_time' => $now,
]);
}
} catch (Throwable $e) {
return $this->error($e->getMessage());
}
return $this->success(__('Saved successfully'));
}
}

View File

@@ -9,6 +9,13 @@ use Webman\Http\Request as WebmanRequest;
/**
* 充值订单
*
* 订单的"由 0 转 1成功入账"统一走 app\common\library\finance\DepositSettlement。
* 当前充值接口为 mock 支付网关,点击即成功;后台不再保留人工审核按钮,
* 如需人工补单,请通过后续专门的"补单/冲正"工具完成,而不是在这个 CRUD 里直接改 status。
*
* 编辑入口现在只用于"查看详情"GET 返回订单 + 关联的 user/channel 信息,
* 阻止 POST 任何改字段的动作(保证金额、状态只能由结算服务变更)。
*/
class DepositOrder extends Backend
{
@@ -18,7 +25,7 @@ class DepositOrder extends Backend
protected bool $modelSceneValidate = true;
protected string|array $quickSearchField = ['id', 'order_no', 'pay_channel', 'remark'];
protected string|array $quickSearchField = ['id', 'order_no', 'pay_channel', 'remark', 'deposit_tier_id', 'idempotency_key'];
protected string|array $defaultSortField = ['id' => 'desc'];
@@ -65,6 +72,69 @@ class DepositOrder extends Backend
]);
}
/**
* GET 时返回关联信息,便于前端详情弹窗直接渲染 user.username / channel.name
* POST 一律拒绝,保证充值订单的金额/状态只能由结算服务变更。
*/
protected function _edit(): Response
{
$pk = $this->model->getPk();
$id = $this->request ? ($this->request->post($pk) ?? $this->request->get($pk)) : null;
if ($id === null || $id === '') {
return $this->error(__('Parameter error'));
}
if ($this->request && $this->request->method() === 'POST') {
return $this->error('充值订单为自动入账,禁止直接修改,如需补单请走专用工具');
}
$row = $this->loadWithRelations(intval(strval($id)));
if (!$row) {
return $this->error(__('Record not found'));
}
if (!$this->checkChannelScoped($row)) {
return $this->error(__('You have no permission'));
}
return $this->success('', ['row' => $row]);
}
private function loadWithRelations(int $id): ?array
{
$row = $this->model
->withJoin($this->withJoinTable, $this->withJoinType)
->with($this->withJoinTable)
->visible([
'user' => ['username', 'phone'],
'channel' => ['name'],
])
->where($this->model->getTable() . '.id', $id)
->find();
if (!$row) {
return null;
}
return $row->toArray();
}
private function checkChannelScoped(array $row): bool
{
if (!$this->auth || $this->auth->isSuperAdmin()) {
return true;
}
$channelIds = $this->getScopedChannelIdsForFilter();
if ($channelIds === []) {
return false;
}
$raw = $row['channel_id'] ?? null;
if ($raw === null || $raw === '') {
return false;
}
if (!is_numeric(strval($raw))) {
return false;
}
return in_array(intval(strval($raw)), $channelIds, true);
}
/**
* @return int[]
*/

View File

@@ -5,10 +5,16 @@ namespace app\admin\controller\order;
use app\common\controller\Backend;
use support\think\Db;
use support\Response;
use Throwable;
use Webman\Http\Request as WebmanRequest;
/**
* 提现订单
*
* 当前审核流转:
* - 用户端提交提现时立即冻结余额user.coin - apply_amount并生成 withdraw_orderstatus=0与 withdraw 流水direction=2
* - 管理员在后台审核通过approve→ status=1拒绝reject→ status=2 并回冲用户余额与流水。
* - 通过流程不再额外扣钱包,因为申请时已冻结;仅在管理员调整 amount/fee 时写一条差额流水。
*/
class WithdrawOrder extends Backend
{
@@ -66,6 +72,387 @@ class WithdrawOrder extends Backend
]);
}
/**
* GET 时返回关联信息,便于编辑弹窗直接渲染 user.username/channel.name
*/
protected function _edit(): Response
{
$pk = $this->model->getPk();
$id = $this->request ? ($this->request->post($pk) ?? $this->request->get($pk)) : null;
if ($id === null || $id === '') {
return $this->error(__('Parameter error'));
}
if ($this->request && $this->request->method() === 'POST') {
// 历史 CRUD 的 POST 编辑已被 approve/reject 替代,这里阻止直接改金额绕过审核流程
return $this->error('请使用通过/拒绝按钮完成审核');
}
$row = $this->loadWithRelations(intval(strval($id)));
if (!$row) {
return $this->error(__('Record not found'));
}
if (!$this->checkChannelScoped($row)) {
return $this->error(__('You have no permission'));
}
return $this->success('', ['row' => $row]);
}
/**
* 审核通过:允许调整 amount/feeactual_amount 自动为 amount - fee。
* 对金额差额自动在用户钱包与流水中做增减,保持账务平衡。
*/
public function approve(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if ($request->method() !== 'POST') {
return $this->error(__('Parameter error'));
}
$id = $this->intParam($request->post('id'));
if ($id <= 0) {
return $this->error(__('Parameter error'));
}
$newAmount = $this->decimalParam($request->post('amount'), '0');
$newFee = $this->decimalParam($request->post('fee'), '0');
if (bccomp($newAmount, '0', 4) <= 0) {
return $this->error('申请金额必须大于 0');
}
if (bccomp($newFee, '0', 4) < 0) {
return $this->error('手续费不能为负');
}
if (bccomp($newFee, $newAmount, 4) > 0) {
return $this->error('手续费不能大于申请金额');
}
$newActual = bcsub($newAmount, $newFee, 4);
$remarkRaw = $request->post('remark');
$remark = is_string($remarkRaw) ? trim($remarkRaw) : '';
$order = Db::name('withdraw_order')->where('id', $id)->find();
if (!$order) {
return $this->error(__('Record not found'));
}
if (!$this->checkChannelScoped($order)) {
return $this->error(__('You have no permission'));
}
$currentStatus = $this->intParam($order['status'] ?? 0);
if ($currentStatus !== 0) {
return $this->error('该订单已审核,无需重复操作');
}
$userId = $this->intParam($order['user_id'] ?? 0);
if ($userId <= 0) {
return $this->error('订单缺少用户信息');
}
$oldAmount = bcadd(strval($order['amount'] ?? '0'), '0', 4);
$diff = bcsub($newAmount, $oldAmount, 4);
$now = time();
$adminId = $this->intParam($this->auth->id ?? 0);
$adminName = $this->adminDisplayName();
$channelIdRaw = $order['channel_id'] ?? null;
$channelId = ($channelIdRaw === null || $channelIdRaw === '')
? null
: $this->intParam($channelIdRaw);
if ($remark === '') {
$remark = '管理员(' . $adminName . ')审核通过:金额 '
. $this->shortAmount($newAmount) . ',手续费 ' . $this->shortAmount($newFee)
. ',实际到账 ' . $this->shortAmount($newActual);
}
Db::startTrans();
try {
// 金额调整差额处理
$cmp = bccomp($diff, '0', 4);
if ($cmp > 0) {
// 新金额更大:再冻结用户 diff
$userRow = Db::name('user')->where('id', $userId)->find();
if (!$userRow) {
Db::rollback();
return $this->error('关联用户不存在');
}
$beforeCoin = bcadd(strval($userRow['coin'] ?? '0'), '0', 4);
if (bccomp($beforeCoin, $diff, 4) < 0) {
Db::rollback();
return $this->error('用户余额不足以补扣调整差额');
}
$afterCoin = bcsub($beforeCoin, $diff, 4);
Db::name('user')->where('id', $userId)->update([
'coin' => $afterCoin,
'total_withdraw_coin' => Db::raw('total_withdraw_coin + ' . $diff),
'update_time' => $now,
]);
Db::name('user_wallet_record')->insert([
'user_id' => $userId,
'channel_id' => $channelId,
'biz_type' => 'withdraw',
'direction' => 2,
'amount' => $diff,
'balance_before' => $beforeCoin,
'balance_after' => $afterCoin,
'ref_type' => 'withdraw_order',
'ref_id' => $id,
'idempotency_key' => 'wd_adjust_add_' . strval($order['order_no'] ?? $id) . '_' . $now,
'operator_admin_id' => $adminId > 0 ? $adminId : null,
'remark' => '管理员(' . $adminName . ')审核调增申请金额差额 '
. $this->shortAmount($diff),
'create_time' => $now,
]);
} elseif ($cmp < 0) {
// 新金额更小:退回差额
$abs = bcsub('0', $diff, 4);
$userRow = Db::name('user')->where('id', $userId)->find();
if (!$userRow) {
Db::rollback();
return $this->error('关联用户不存在');
}
$beforeCoin = bcadd(strval($userRow['coin'] ?? '0'), '0', 4);
$afterCoin = bcadd($beforeCoin, $abs, 4);
Db::name('user')->where('id', $userId)->update([
'coin' => $afterCoin,
'total_withdraw_coin' => Db::raw('total_withdraw_coin - ' . $abs),
'update_time' => $now,
]);
Db::name('user_wallet_record')->insert([
'user_id' => $userId,
'channel_id' => $channelId,
'biz_type' => 'withdraw_refund',
'direction' => 1,
'amount' => $abs,
'balance_before' => $beforeCoin,
'balance_after' => $afterCoin,
'ref_type' => 'withdraw_order',
'ref_id' => $id,
'idempotency_key' => 'wd_adjust_sub_' . strval($order['order_no'] ?? $id) . '_' . $now,
'operator_admin_id' => $adminId > 0 ? $adminId : null,
'remark' => '管理员(' . $adminName . ')审核调减申请金额差额 '
. $this->shortAmount($abs),
'create_time' => $now,
]);
}
Db::name('withdraw_order')->where('id', $id)->update([
'amount' => $newAmount,
'fee' => $newFee,
'actual_amount' => $newActual,
'status' => 1,
'review_admin_id' => $adminId > 0 ? $adminId : null,
'review_time' => $now,
'remark' => substr($remark, 0, 255),
'update_time' => $now,
]);
Db::commit();
} catch (Throwable $e) {
Db::rollback();
return $this->error($e->getMessage());
}
return $this->success('审核通过', [
'id' => $id,
'amount' => $newAmount,
'fee' => $newFee,
'actual_amount' => $newActual,
'status' => 1,
]);
}
/**
* 审核拒绝必须填写驳回原因remark
* 回冲申请时的冻结user.coin += amounttotal_withdraw_coin -= amount写一条 withdraw_refund 流水。
*/
public function reject(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if ($request->method() !== 'POST') {
return $this->error(__('Parameter error'));
}
$id = $this->intParam($request->post('id'));
if ($id <= 0) {
return $this->error(__('Parameter error'));
}
$remarkRaw = $request->post('remark');
$remark = is_string($remarkRaw) ? trim($remarkRaw) : '';
if ($remark === '') {
return $this->error('请填写拒绝原因');
}
$order = Db::name('withdraw_order')->where('id', $id)->find();
if (!$order) {
return $this->error(__('Record not found'));
}
if (!$this->checkChannelScoped($order)) {
return $this->error(__('You have no permission'));
}
$currentStatus = $this->intParam($order['status'] ?? 0);
if ($currentStatus !== 0) {
return $this->error('该订单已审核,无需重复操作');
}
$userId = $this->intParam($order['user_id'] ?? 0);
if ($userId <= 0) {
return $this->error('订单缺少用户信息');
}
$amount = bcadd(strval($order['amount'] ?? '0'), '0', 4);
$channelIdRaw = $order['channel_id'] ?? null;
$channelId = ($channelIdRaw === null || $channelIdRaw === '')
? null
: $this->intParam($channelIdRaw);
$now = time();
$adminId = $this->intParam($this->auth->id ?? 0);
$adminName = $this->adminDisplayName();
Db::startTrans();
try {
$userRow = Db::name('user')->where('id', $userId)->find();
if (!$userRow) {
Db::rollback();
return $this->error('关联用户不存在');
}
$beforeCoin = bcadd(strval($userRow['coin'] ?? '0'), '0', 4);
$afterCoin = bcadd($beforeCoin, $amount, 4);
Db::name('user')->where('id', $userId)->update([
'coin' => $afterCoin,
'total_withdraw_coin' => Db::raw('total_withdraw_coin - ' . $amount),
'update_time' => $now,
]);
Db::name('user_wallet_record')->insert([
'user_id' => $userId,
'channel_id' => $channelId,
'biz_type' => 'withdraw_refund',
'direction' => 1,
'amount' => $amount,
'balance_before' => $beforeCoin,
'balance_after' => $afterCoin,
'ref_type' => 'withdraw_order',
'ref_id' => $id,
'idempotency_key' => 'wd_reject_' . strval($order['order_no'] ?? $id) . '_' . $now,
'operator_admin_id' => $adminId > 0 ? $adminId : null,
'remark' => '管理员(' . $adminName . ')驳回提现,退回冻结金额 '
. $this->shortAmount($amount) . '' . $remark,
'create_time' => $now,
]);
Db::name('withdraw_order')->where('id', $id)->update([
'status' => 2,
'review_admin_id' => $adminId > 0 ? $adminId : null,
'review_time' => $now,
'remark' => substr($remark, 0, 255),
'update_time' => $now,
]);
Db::commit();
} catch (Throwable $e) {
Db::rollback();
return $this->error($e->getMessage());
}
return $this->success('审核已拒绝', [
'id' => $id,
'status' => 2,
'remark' => $remark,
]);
}
private function loadWithRelations(int $id): ?array
{
$row = $this->model
->withJoin($this->withJoinTable, $this->withJoinType)
->with($this->withJoinTable)
->visible([
'user' => ['username', 'phone'],
'channel' => ['name'],
'reviewAdmin' => ['username'],
])
->where($this->model->getTable() . '.id', $id)
->find();
if (!$row) {
return null;
}
return $row->toArray();
}
private function checkChannelScoped(array|object $row): bool
{
if (!$this->auth || $this->auth->isSuperAdmin()) {
return true;
}
$channelIds = $this->getScopedChannelIdsForFilter();
if ($channelIds === []) {
return false;
}
$raw = is_array($row) ? ($row['channel_id'] ?? null) : ($row->channel_id ?? null);
if ($raw === null || $raw === '') {
// 无归属渠道的数据只有超管可见
return false;
}
$cid = $this->intParam($raw);
return in_array($cid, $channelIds, true);
}
private function intParam($raw): int
{
if ($raw === null || $raw === '') {
return 0;
}
if (!is_numeric(strval($raw))) {
return 0;
}
return intval(strval($raw));
}
private function decimalParam($raw, string $default): string
{
if ($raw === null || $raw === '' || !is_numeric(strval($raw))) {
return bcadd($default, '0', 4);
}
return bcadd(strval($raw), '0', 4);
}
private function adminDisplayName(): string
{
if (!$this->auth) {
return 'admin';
}
$name = $this->auth->username ?? null;
if (is_string($name) && $name !== '') {
return $name;
}
$id = $this->intParam($this->auth->id ?? 0);
return '#' . strval($id);
}
/**
* 把 4 位小数金额压缩成最多 2 位小数用于展示(不影响落库精度)
*/
private function shortAmount(string $amount): string
{
if (!is_numeric($amount)) {
return $amount;
}
$normalized = bcadd($amount, '0', 4);
$negative = false;
if (str_starts_with($normalized, '-')) {
$negative = true;
$normalized = substr($normalized, 1);
}
$parts = explode('.', $normalized, 2);
$intPart = $parts[0] ?? '0';
$fracPart = $parts[1] ?? '0000';
$displayFrac = substr($fracPart, 0, 2);
$v = $intPart . '.' . str_pad($displayFrac, 2, '0');
return $negative ? ('-' . $v) : $v;
}
/**
* @return int[]
*/

View File

@@ -20,7 +20,7 @@ class User extends Backend
*/
protected ?object $model = null;
protected array|string $preExcludeFields = ['id', 'uuid', 'create_time', 'update_time', 'invite_code', 'coin', 'total_deposit_coin', 'total_valid_bet_coin'];
protected array|string $preExcludeFields = ['id', 'uuid', 'create_time', 'update_time', 'invite_code', 'coin', 'total_deposit_coin', 'total_withdraw_coin', 'bet_flow_coin'];
protected array $withJoinTable = ['channel', 'admin'];

View File

@@ -5,12 +5,14 @@ namespace app\api\controller;
use ba\Date;
use ba\Captcha;
use ba\Random;
use app\common\library\finance\WithdrawFlow;
use app\common\model\User;
use app\common\facade\Token;
use app\common\model\UserScoreLog;
use app\common\model\UserMoneyLog;
use app\common\controller\Frontend;
use app\common\facade\Token as TokenFacade;
use support\think\Db;
use support\validation\Validator;
use support\validation\ValidationException;
use Webman\Http\Request;
@@ -41,17 +43,60 @@ class Account extends Frontend
}
$user = $this->auth->getUser();
$userId = intval(strval($user->id));
$coinBalance = WithdrawFlow::amountString($user->coin ?? '0');
// 打码量 / 提现配额快照
$flow = WithdrawFlow::status($userId, [
'total_deposit_coin' => $user->total_deposit_coin ?? '0',
'total_withdraw_coin' => $user->total_withdraw_coin ?? '0',
'bet_flow_coin' => $user->bet_flow_coin ?? '0',
]);
$maxWithdrawable = WithdrawFlow::maxWithdrawable($coinBalance, $flow);
// 待审核提现订单数(配合 /api/finance/withdrawCreate 的 3 笔上限)
$pendingWithdrawCount = Db::name('withdraw_order')
->where('user_id', $userId)
->where('status', 0)
->count();
$payload = [
'code' => 1,
'message' => __('ok'),
'data' => [
'uuid' => $user->uuid ?? '',
'username' => $user->username,
'head_image' => $user->avatar ?? '',
'coin' => $user->coin,
'current_streak' => $user->current_streak ?? 0,
'channel_id' => $user->channel_id,
'risk_flags' => $user->risk_flags ?? 0,
'uuid' => $user->uuid ?? '',
'username' => $user->username,
'head_image' => $user->avatar ?? '',
'phone' => $user->phone ?? '',
'email' => $user->email ?? '',
'register_invite_code' => $user->register_invite_code ?? '',
'channel_id' => $user->channel_id,
'risk_flags' => $user->risk_flags ?? 0,
'current_streak' => $user->current_streak ?? 0,
'last_bet_period_no' => $user->last_bet_period_no ?? '',
'create_time' => $user->create_time ?? 0,
// 资金字段4 位小数字符串,与 /api/wallet/balanceSummary 对齐)
'coin' => $coinBalance,
'coin_balance' => $coinBalance,
'frozen_balance' => '0.0000',
'total_deposit_coin' => WithdrawFlow::amountString($user->total_deposit_coin ?? '0'),
'total_withdraw_coin' => WithdrawFlow::amountString($user->total_withdraw_coin ?? '0'),
'bet_flow_coin' => $flow['bet_flow_coin'],
'max_withdrawable' => $maxWithdrawable,
'withdraw_flow' => [
'ratio' => $flow['ratio'],
'net_deposit' => $flow['net_deposit'],
'required_bet_flow' => $flow['required_bet_flow'],
'remaining_bet_flow' => $flow['remaining_bet_flow'],
'eligible' => $flow['eligible'],
'max_withdraw_by_flow' => $flow['flow_unlimited'] ? null : $flow['max_withdraw_by_flow'],
'flow_unlimited' => $flow['flow_unlimited'],
'pending_withdraw' => [
'count' => $pendingWithdrawCount,
'max' => WithdrawFlow::MAX_PENDING_WITHDRAW,
],
],
],
];
return \response(json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 200, ['Content-Type' => 'application/json']);

View File

@@ -15,7 +15,7 @@ use support\Response;
class Auth extends MobileBase
{
protected array $noNeedLogin = ['register', 'login', 'refreshToken', 'userRegister', 'userLogin', 'tokenRefresh'];
protected array $noNeedAuthToken = ['register', 'login', 'refreshToken', 'userRegister', 'userLogin', 'tokenRefresh'];
protected array $noNeedAuthToken = ['register', 'refreshToken', 'userRegister', 'tokenRefresh'];
public function userRegister(Request $request): Response
{

View File

@@ -4,57 +4,230 @@ declare(strict_types=1);
namespace app\api\controller;
use app\common\library\finance\DepositSettlement;
use app\common\library\finance\WithdrawFlow;
use app\common\library\game\DepositTier as DepositTierLib;
use app\common\model\DepositOrder;
use app\common\model\GameConfig;
use app\common\model\WithdrawOrder;
use Webman\Http\Request;
use support\Response;
use support\think\Db;
use Throwable;
use Webman\Http\Request;
class Finance extends MobileBase
{
/**
* 充值档位列表(仅启用档位,按 sort 升序)
*/
public function depositTierList(Request $request): Response
{
$response = $this->initializeMobile($request);
if ($response !== null) {
return $response;
}
$lang = $this->currentLang();
$tiers = $this->loadEnabledTiers();
$list = [];
foreach ($tiers as $tier) {
$amount = $this->amountString($tier['amount'] ?? '0');
$bonus = $this->amountString($tier['bonus_amount'] ?? '0');
$total = bcadd($amount, $bonus, 4);
$localized = DepositTierLib::localize($tier, $lang);
$list[] = [
'id' => $tier['id'],
'title' => $localized['title'],
'amount' => $amount,
'bonus_amount' => $bonus,
'total_amount' => $total,
'desc' => $localized['desc'],
];
}
return $this->mobileSuccess([
'list' => $list,
]);
}
/**
* 获取当前请求语言标识(由中间件 LoadLangPack 设置到 locale规范为小写、以 "-" 连字
*/
private function currentLang(): string
{
$lang = function_exists('locale') ? locale() : '';
if (!is_string($lang) || $lang === '') {
return 'zh-cn';
}
return strtolower(str_replace('_', '-', $lang));
}
/**
* 创建充值订单
*
* 当前为 mock 支付网关,点击即成功:服务端直接在同一请求内完成订单入账。
* 未来接入真实第三方支付时,仅需把 "立即结算" 替换为 "返回 pay_url 进入网关"
* 并把入账动作放到网关回调里完成(回调中调用 DepositSettlement::settle
*
* 请求application/json 或 x-www-form-urlencoded
* - tier_id: 必填,档位 ID需在 game_config.deposit_tier 启用档位内)
* - idempotency_key: 必填,客户端幂等键,短时间内重复提交只生成一次订单
*
* 响应(统一结构,未来接入第三方也保持此形状):
* - order_no / amount / pay_channel / paid / pay_url / status / create_time / pay_time
*/
public function depositCreate(Request $request): Response
{
$response = $this->initializeMobile($request);
if ($response !== null) {
return $response;
}
$payAmountFiat = (string) $request->post('pay_amount_fiat', '');
$fiatCurrency = trim((string) $request->post('fiat_currency', ''));
$channel = trim((string) $request->post('channel', ''));
$idempotencyKey = trim((string) $request->post('idempotency_key', ''));
if ($payAmountFiat === '' || $fiatCurrency === '' || $channel === '' || $idempotencyKey === '') {
$tierId = $this->stringParam($request->input('tier_id'));
$idempotencyKey = $this->stringParam($request->input('idempotency_key'));
if ($tierId === '' || $idempotencyKey === '') {
return $this->mobileError(1001, 'Missing parameters');
}
if (mb_strlen($idempotencyKey) > 64) {
return $this->mobileError(1002, 'Idempotency key is too long');
}
$tiers = $this->loadEnabledTiers();
$tier = DepositTierLib::findById($tiers, $tierId);
if (!$tier) {
return $this->mobileError(2003, 'Deposit tier not available');
}
// 幂等命中:直接返回已有订单
try {
$existing = DepositOrder::where('idempotency_key', $idempotencyKey)->find();
if ($existing) {
if (intval($existing->user_id) !== intval($this->auth->id)) {
return $this->mobileError(1002, 'Idempotency key conflict');
}
return $this->mobileSuccess($this->buildDepositResponse($existing));
}
} catch (Throwable $e) {
// 忽略幂等查询失败,继续创建
}
$user = $this->auth->getUser();
$orderNo = 'DP' . date('YmdHis') . substr(str_replace('.', '', uniqid('', true)), -6);
$coinAmount = $payAmountFiat;
DepositOrder::create([
'order_no' => $orderNo,
'user_id' => $this->auth->id,
'fiat_currency' => $fiatCurrency,
'fiat_amount' => $payAmountFiat,
'fx_rate' => '1.00000000',
'coin_amount' => $coinAmount,
'gateway' => $channel,
'status' => 0,
'create_time' => time(),
'update_time' => time(),
]);
$tierSnapshot = [
'id' => $tier['id'],
'title' => is_string($tier['title'] ?? null) ? $tier['title'] : '',
'title_en' => is_string($tier['title_en'] ?? null) ? $tier['title_en'] : '',
'amount' => $this->amountString($tier['amount'] ?? '0'),
'bonus_amount' => $this->amountString($tier['bonus_amount'] ?? '0'),
'desc' => is_string($tier['desc'] ?? null) ? $tier['desc'] : '',
'desc_en' => is_string($tier['desc_en'] ?? null) ? $tier['desc_en'] : '',
];
return $this->mobileSuccess([
'order_no' => $orderNo,
'coin_amount' => $coinAmount,
'pay_url' => '',
'status' => 'pending',
]);
$now = time();
$channelId = null;
if (isset($user->channel_id) && is_numeric(strval($user->channel_id))) {
$channelId = intval(strval($user->channel_id));
}
$orderId = 0;
try {
$order = DepositOrder::create([
'order_no' => $orderNo,
'idempotency_key' => $idempotencyKey,
'user_id' => intval($user->id),
'channel_id' => $channelId,
'amount' => $tierSnapshot['amount'],
'bonus_amount' => $tierSnapshot['bonus_amount'],
'status' => 0,
'pay_channel' => 'mock_gateway',
'deposit_tier_id' => $tier['id'],
'proof_image' => '',
'pay_account_snapshot' => json_encode($tierSnapshot, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
'remark' => '',
'create_time' => $now,
'update_time' => $now,
]);
$orderId = intval($order->id);
} catch (Throwable $e) {
$msg = $e->getMessage();
if (stripos($msg, 'Duplicate') !== false && stripos($msg, 'uk_deposit_order_idem') !== false) {
$existing = DepositOrder::where('idempotency_key', $idempotencyKey)->find();
if ($existing) {
return $this->mobileSuccess($this->buildDepositResponse($existing));
}
}
return $this->mobileError(2000, $msg);
}
// Mock 网关:立即结算,入账到钱包
try {
DepositSettlement::settle(
$orderId,
DepositSettlement::SOURCE_MOCK_GATEWAY,
'mock gateway auto settled'
);
} catch (Throwable $e) {
return $this->mobileError(2000, $e->getMessage());
}
$settled = DepositOrder::where('id', $orderId)->find();
if (!$settled) {
return $this->mobileError(2000, 'Order not found after settle');
}
return $this->mobileSuccess($this->buildDepositResponse($settled));
}
/**
* 将订单模型转换为统一的创建/详情响应数据
*/
private function buildDepositResponse($order): array
{
$status = $this->mapDepositStatus($order->status);
$paid = $status === 'paid';
$amount = $this->amountString($order->amount);
$bonus = $this->amountString($order->bonus_amount);
$total = bcadd($amount, $bonus, 4);
return [
'order_no' => is_string($order->order_no) ? $order->order_no : strval($order->order_no),
'amount' => $amount,
'bonus_amount' => $bonus,
'total_amount' => $total,
'status' => $status,
'paid' => $paid,
'pay_channel' => is_string($order->pay_channel) ? $order->pay_channel : strval($order->pay_channel),
'pay_url' => '',
'create_time' => is_numeric(strval($order->create_time)) ? intval(strval($order->create_time)) : 0,
'pay_time' => is_numeric(strval($order->pay_time)) ? intval(strval($order->pay_time)) : 0,
];
}
/**
* 将任意金额输入归一化为 4 位小数字符串(不做类型强制转换)
*/
private function amountString($raw): string
{
if (is_string($raw)) {
$s = trim($raw);
} elseif (is_int($raw) || is_float($raw)) {
$s = strval($raw);
} else {
return '0.0000';
}
if ($s === '' || !is_numeric($s)) {
return '0.0000';
}
return bcadd($s, '0', 4);
}
/**
* 查看充值订单详情(原 depositDetail。根据 order_no 返回完整订单快照。
*/
public function depositDetail(Request $request): Response
{
$response = $this->initializeMobile($request);
if ($response !== null) {
return $response;
}
$orderNo = trim((string) $request->get('order_no', ''));
$orderNo = $this->stringParam($request->input('order_no'));
if ($orderNo === '') {
return $this->mobileError(1001, 'Missing parameters');
}
@@ -62,12 +235,47 @@ class Finance extends MobileBase
if (!$order) {
return $this->mobileError(2003, 'Order does not exist');
}
return $this->mobileSuccess($this->buildDepositResponse($order));
}
/**
* 查询当前用户的充值订单列表(分页)。列表项返回 order_no / amount / bonus_amount / status
* 其他字段请调用 /api/finance/depositDetail。
*/
public function depositList(Request $request): Response
{
$response = $this->initializeMobile($request);
if ($response !== null) {
return $response;
}
$page = $this->intValue($request->input('page', 1));
if ($page <= 0) {
$page = 1;
}
$pageSize = $this->intValue($request->input('page_size', 20));
if ($pageSize <= 0 || $pageSize > 100) {
$pageSize = 20;
}
$paginate = DepositOrder::where('user_id', $this->auth->id)
->order('id', 'desc')
->paginate(['page' => $page, 'list_rows' => $pageSize]);
$list = [];
foreach ($paginate->items() as $row) {
$list[] = [
'order_no' => $row->order_no,
'amount' => $this->amountString($row->amount ?? '0'),
'bonus_amount' => $this->amountString($row->bonus_amount ?? '0'),
'status' => $this->mapDepositStatus($row->status ?? null),
];
}
return $this->mobileSuccess([
'order_no' => $order->order_no,
'status' => $this->mapDepositStatus($order->status),
'coin_amount' => $order->coin_amount,
'create_time' => $order->create_time,
'finish_time' => $order->paid_at,
'list' => $list,
'pagination' => [
'page' => $paginate->currentPage(),
'page_size' => $paginate->listRows(),
'total' => $paginate->total(),
],
]);
}
@@ -77,51 +285,142 @@ class Finance extends MobileBase
if ($response !== null) {
return $response;
}
$withdrawCoin = (string) $request->post('withdraw_coin', '');
$receiveAccount = trim((string) $request->post('receive_account', ''));
$receiveType = trim((string) $request->post('receive_type', ''));
$idempotencyKey = trim((string) $request->post('idempotency_key', ''));
$withdrawCoinRaw = $request->post('withdraw_coin', '');
$withdrawCoin = is_string($withdrawCoinRaw) ? trim($withdrawCoinRaw) : (is_numeric($withdrawCoinRaw) ? strval($withdrawCoinRaw) : '');
$receiveAccount = trim(is_string($request->post('receive_account', '')) ? $request->post('receive_account', '') : '');
$receiveType = trim(is_string($request->post('receive_type', '')) ? $request->post('receive_type', '') : '');
$idempotencyKey = trim(is_string($request->post('idempotency_key', '')) ? $request->post('idempotency_key', '') : '');
if ($withdrawCoin === '' || $receiveAccount === '' || $receiveType === '' || $idempotencyKey === '') {
return $this->mobileError(1001, 'Missing parameters');
}
if (!is_numeric($withdrawCoin) || bccomp($withdrawCoin, '0', 4) <= 0) {
return $this->mobileError(1001, 'Invalid withdraw amount');
}
$withdrawCoin = bcadd($withdrawCoin, '0', 4);
$user = $this->auth->getUser();
if (bccomp((string) $user->coin, $withdrawCoin, 4) < 0) {
$userId = intval(strval($user->id));
// 待审核订单数限制:同一用户最多 MAX_PENDING_WITHDRAW 笔 status=0待审核
$pendingCount = Db::name('withdraw_order')
->where('user_id', $userId)
->where('status', 0)
->count();
if ($pendingCount >= WithdrawFlow::MAX_PENDING_WITHDRAW) {
return $this->mobileError(2004, 'Too many pending withdraw orders', [
'max_pending' => WithdrawFlow::MAX_PENDING_WITHDRAW,
'pending_count' => $pendingCount,
]);
}
$balanceBefore = bcadd(strval($user->coin ?? '0'), '0', 4);
if (bccomp($balanceBefore, $withdrawCoin, 4) < 0) {
return $this->mobileError(2001, 'Insufficient balance');
}
// 单笔上限校验:提现金额 <= min(coin, max_withdraw_by_flow)
// - max_withdraw_by_flow = max(0, bet_flow_coin / ratio - total_withdraw_coin)
// - ratio = 0 视为"不限打码",上限仅取余额
// 超过上限直接回传 max_withdrawable前端可据此提示"最大可提现金额为 XXX"。
$flowStatus = WithdrawFlow::status($userId, [
'total_deposit_coin' => $user->total_deposit_coin ?? '0',
'total_withdraw_coin' => $user->total_withdraw_coin ?? '0',
'bet_flow_coin' => $user->bet_flow_coin ?? '0',
]);
$maxWithdrawable = WithdrawFlow::maxWithdrawable($balanceBefore, $flowStatus);
if (bccomp($withdrawCoin, $maxWithdrawable, 4) > 0) {
return $this->mobileError(2002, 'Withdraw exceeds available bet flow', [
'max_withdrawable' => $maxWithdrawable,
'coin_balance' => $balanceBefore,
'bet_flow_coin' => $flowStatus['bet_flow_coin'],
'total_withdraw_coin' => WithdrawFlow::amountString($user->total_withdraw_coin ?? '0'),
'ratio' => $flowStatus['ratio'],
'max_withdraw_by_flow' => $flowStatus['flow_unlimited'] ? null : $flowStatus['max_withdraw_by_flow'],
]);
}
$channelIdRaw = $user->channel_id ?? null;
$channelId = ($channelIdRaw !== null && $channelIdRaw !== '' && is_numeric(strval($channelIdRaw)))
? intval(strval($channelIdRaw))
: null;
$orderNo = 'WD' . date('YmdHis') . substr(str_replace('.', '', uniqid('', true)), -6);
$feeCoin = bcmul($withdrawCoin, '0.005', 4);
$actualArrivalCoin = bcsub($withdrawCoin, $feeCoin, 4);
WithdrawOrder::create([
'order_no' => $orderNo,
'user_id' => $user->id,
'apply_amount' => $withdrawCoin,
'fee_amount' => $feeCoin,
'actual_amount' => $actualArrivalCoin,
'fiat_currency' => '',
'need_audit' => 1,
'audit_status' => 0,
'reject_reason' => '',
'create_time' => time(),
'update_time' => time(),
]);
$balanceAfter = bcsub($balanceBefore, $withdrawCoin, 4);
$now = time();
Db::startTrans();
try {
// 钱包即时扣减(冻结语义):审核通过即定稿;审核驳回在管理端回冲。
$affected = Db::name('user')
->where('id', $userId)
->where('coin', '>=', $withdrawCoin)
->update([
'coin' => Db::raw('coin - ' . $withdrawCoin),
'total_withdraw_coin' => Db::raw('total_withdraw_coin + ' . $withdrawCoin),
'update_time' => $now,
]);
if ($affected <= 0) {
Db::rollback();
return $this->mobileError(2001, 'Insufficient balance');
}
$orderId = Db::name('withdraw_order')->insertGetId([
'order_no' => $orderNo,
'user_id' => $userId,
'channel_id' => $channelId,
'amount' => $withdrawCoin,
'fee' => $feeCoin,
'actual_amount' => $actualArrivalCoin,
'status' => 0,
'review_admin_id' => null,
'review_time' => null,
'remark' => '',
'create_time' => $now,
'update_time' => $now,
]);
Db::name('user_wallet_record')->insert([
'user_id' => $userId,
'channel_id' => $channelId,
'biz_type' => 'withdraw',
'direction' => 2,
'amount' => $withdrawCoin,
'balance_before' => $balanceBefore,
'balance_after' => $balanceAfter,
'ref_type' => 'withdraw_order',
'ref_id' => $orderId,
'idempotency_key' => 'wd_apply_' . $orderNo,
'operator_admin_id' => null,
'remark' => '用户申请提现(待审核冻结):' . $orderNo,
'create_time' => $now,
]);
Db::commit();
} catch (Throwable $e) {
Db::rollback();
return $this->mobileError(2000, $e->getMessage());
}
return $this->mobileSuccess([
'order_no' => $orderNo,
'status' => 'pending_review',
'fee_coin' => $feeCoin,
'actual_arrival_coin' => $actualArrivalCoin,
'order_no' => $orderNo,
'status' => 'pending_review',
'fee_coin' => $feeCoin,
'actual_arrival_coin' => $actualArrivalCoin,
'risk_review_required' => true,
]);
}
/**
* 查看提现订单详情(原 withdrawDetail。根据 order_no 返回完整订单快照。
*/
public function withdrawDetail(Request $request): Response
{
$response = $this->initializeMobile($request);
if ($response !== null) {
return $response;
}
$orderNo = trim((string) $request->get('order_no', ''));
$orderNo = $this->stringParam($request->input('order_no'));
if ($orderNo === '') {
return $this->mobileError(1001, 'Missing parameters');
}
@@ -129,16 +428,79 @@ class Finance extends MobileBase
if (!$order) {
return $this->mobileError(2003, 'Order does not exist');
}
$remarkRaw = $order->remark ?? '';
$remark = is_string($remarkRaw) ? $remarkRaw : strval($remarkRaw);
$statusCode = $this->intValue($order->status);
return $this->mobileSuccess([
'order_no' => $order->order_no,
'status' => $this->mapWithdrawStatus($order->audit_status),
'withdraw_coin' => $order->apply_amount,
'fee_coin' => $order->fee_amount,
'reject_reason' => $order->reject_reason === '' ? null : $order->reject_reason,
'create_time' => $order->create_time,
'order_no' => $order->order_no,
'status' => $this->mapWithdrawStatus($statusCode),
'withdraw_coin' => $order->amount,
'fee_coin' => $order->fee,
'actual_arrival_coin' => $order->actual_amount,
'reject_reason' => $statusCode === 2 && $remark !== '' ? $remark : null,
'create_time' => $order->create_time,
'review_time' => $order->review_time,
]);
}
/**
* 查询当前用户的提现订单列表(分页)。列表项返回 order_no / amount / status
* 手续费、实到账、拒绝原因等请调用 /api/finance/withdrawDetail。
*/
public function withdrawList(Request $request): Response
{
$response = $this->initializeMobile($request);
if ($response !== null) {
return $response;
}
$page = $this->intValue($request->input('page', 1));
if ($page <= 0) {
$page = 1;
}
$pageSize = $this->intValue($request->input('page_size', 20));
if ($pageSize <= 0 || $pageSize > 100) {
$pageSize = 20;
}
$paginate = WithdrawOrder::where('user_id', $this->auth->id)
->order('id', 'desc')
->paginate(['page' => $page, 'list_rows' => $pageSize]);
$list = [];
foreach ($paginate->items() as $row) {
$list[] = [
'order_no' => $row->order_no,
'amount' => $this->amountString($row->amount ?? '0'),
'status' => $this->mapWithdrawStatus($row->status ?? null),
];
}
return $this->mobileSuccess([
'list' => $list,
'pagination' => [
'page' => $paginate->currentPage(),
'page_size' => $paginate->listRows(),
'total' => $paginate->total(),
],
]);
}
private function stringParam($raw): string
{
if ($raw === null) {
return '';
}
if (!is_string($raw)) {
return '';
}
return trim($raw);
}
private function loadEnabledTiers(): array
{
$row = GameConfig::where('config_key', DepositTierLib::CONFIG_KEY)->find();
$all = DepositTierLib::parseFromConfigValue($row?->config_value ?? null);
return DepositTierLib::publicList($all);
}
private function mapDepositStatus($status): string
{
if ($this->intValue($status) === 1) {
@@ -150,12 +512,16 @@ class Finance extends MobileBase
return 'pending';
}
private function mapWithdrawStatus($auditStatus): string
/**
* 映射 withdraw_order.status0 待审 / 1 通过 / 2 拒绝 / 3 已打款)到移动端状态字符串
*/
private function mapWithdrawStatus($statusCode): string
{
if ($this->intValue($auditStatus) === 1) {
$code = $this->intValue($statusCode);
if ($code === 1 || $code === 3) {
return 'approved';
}
if ($this->intValue($auditStatus) === 2) {
if ($code === 2) {
return 'rejected';
}
return 'pending_review';
@@ -170,4 +536,3 @@ class Finance extends MobileBase
return $result;
}
}

View File

@@ -95,7 +95,7 @@ class Game extends MobileBase
if ($response !== null) {
return $response;
}
$limit = $this->intValue($request->get('limit', 30));
$limit = $this->intValue($request->input('limit', 30));
if ($limit < 1) {
$limit = 30;
}
@@ -133,6 +133,12 @@ class Game extends MobileBase
]);
}
/**
* 提交下注入参极简——period_no + numbers + bet_amount整笔总金额 + idempotency_key。
*
* 下注判定:开奖号码 ∈ pick_numbers 即算中奖,赔付按整笔 total_amount × odds 计算
* odds 定义见 GameBetSettleService::BASE_ODDS 与 streak_at_bet
*/
public function betPlace(Request $request): Response
{
$response = $this->initializeMobile($request);
@@ -141,11 +147,16 @@ class Game extends MobileBase
}
$periodNo = trim((string) $request->post('period_no', ''));
$numbersRaw = $request->post('numbers', '');
$betAmount = (string) $request->post('bet_amount', '');
$betAmount = trim((string) $request->post('bet_amount', ''));
$idempotencyKey = trim((string) $request->post('idempotency_key', ''));
if ($periodNo === '' || $betAmount === '' || $idempotencyKey === '') {
return $this->mobileError(1001, 'Missing parameters');
}
if (!is_numeric($betAmount) || bccomp($betAmount, '0', 4) <= 0) {
return $this->mobileError(1003, 'Invalid parameter value');
}
$totalAmount = bcadd($betAmount, '0', 4);
$numbers = $this->parseBetNumbersFromRequest($numbersRaw);
if ($numbers === []) {
return $this->mobileError(1003, 'Invalid parameter value');
@@ -164,8 +175,6 @@ class Game extends MobileBase
}
$user = $this->auth->getUser();
$pickCount = count($numbers);
$totalAmount = bcmul($betAmount, (string) $pickCount, 4);
if (bccomp((string) $user->coin, $totalAmount, 4) < 0) {
return $this->mobileError(2001, 'Insufficient balance');
}
@@ -199,8 +208,6 @@ class Game extends MobileBase
'user_id' => $user->id,
'channel_id' => $user->channel_id,
'pick_numbers' => $numbers,
'unit_amount' => $betAmount,
'pick_count' => $pickCount,
'total_amount' => $totalAmount,
'streak_at_bet' => $user->current_streak ?? 0,
'is_auto' => 0,
@@ -231,8 +238,8 @@ class Game extends MobileBase
if ($response !== null) {
return $response;
}
$page = $this->intValue($request->get('page', 1));
$pageSize = $this->intValue($request->get('page_size', 20));
$page = $this->intValue($request->input('page', 1));
$pageSize = $this->intValue($request->input('page_size', 20));
$paginate = BetOrder::where('user_id', $this->auth->id)->order('id', 'desc')->paginate([
'page' => $page,
'list_rows' => $pageSize,
@@ -244,7 +251,8 @@ class Game extends MobileBase
'order_no' => (string) $item->id,
'period_no' => $item->period_no,
'numbers' => $item->pick_numbers ?? [],
'bet_amount' => $item->unit_amount,
// 整笔压注金额(与请求 bet_amount 语义一致)
'bet_amount' => $item->total_amount,
'total_amount' => $item->total_amount,
'result_number' => null,
'win_amount' => $item->win_amount,

View File

@@ -17,8 +17,8 @@ class Notice extends MobileBase
if ($response !== null) {
return $response;
}
$page = $this->intValue($request->get('page', 1), 1);
$pageSize = $this->intValue($request->get('page_size', 20), 20);
$page = $this->intValue($request->input('page', 1), 1);
$pageSize = $this->intValue($request->input('page_size', 20), 20);
$paginate = OperationNotice::where('status', 1)->order('id', 'desc')->paginate([
'page' => $page,
@@ -55,7 +55,7 @@ class Notice extends MobileBase
if ($response !== null) {
return $response;
}
$id = $this->intValue($request->get('id', 0), 0);
$id = $this->intValue($request->input('notice_id', 0), 0);
if ($id < 1) {
return $this->mobileError(1001, 'Missing parameters');
}
@@ -79,7 +79,7 @@ class Notice extends MobileBase
if ($response !== null) {
return $response;
}
$noticeId = $this->intValue($request->post('notice_id', 0), 0);
$noticeId = $this->intValue($request->input('notice_id', 0), 0);
if ($noticeId < 1) {
return $this->mobileError(1001, 'Missing parameters');
}

View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace app\api\controller;
use app\common\library\finance\WithdrawFlow;
use app\common\model\UserWalletRecord;
use Webman\Http\Request;
use support\Response;
@@ -17,12 +18,30 @@ class Wallet extends MobileBase
return $response;
}
$user = $this->auth->getUser();
$coinBalance = WithdrawFlow::amountString($user->coin ?? '0');
$flow = WithdrawFlow::status(intval($user->id), [
'total_deposit_coin' => $user->total_deposit_coin ?? '0',
'total_withdraw_coin' => $user->total_withdraw_coin ?? '0',
'bet_flow_coin' => $user->bet_flow_coin ?? '0',
]);
$maxWithdrawable = WithdrawFlow::maxWithdrawable($coinBalance, $flow);
return $this->mobileSuccess([
'coin_balance' => $user->coin,
'frozen_balance' => '0.0000',
'total_deposit_coin' => $user->total_deposit_coin ?? '0.0000',
'total_valid_bet_coin' => $user->total_valid_bet_coin ?? '0.0000',
'withdrawable_balance' => $user->coin,
'coin_balance' => $coinBalance,
'frozen_balance' => '0.0000',
'withdrawable_balance' => $coinBalance,
'max_withdrawable' => $maxWithdrawable,
'total_deposit_coin' => WithdrawFlow::amountString($user->total_deposit_coin ?? '0'),
'total_withdraw_coin' => WithdrawFlow::amountString($user->total_withdraw_coin ?? '0'),
'bet_flow_coin' => $flow['bet_flow_coin'],
'withdraw_flow' => [
'ratio' => $flow['ratio'],
'net_deposit' => $flow['net_deposit'],
'required_bet_flow' => $flow['required_bet_flow'],
'remaining_bet_flow' => $flow['remaining_bet_flow'],
'eligible' => $flow['eligible'],
'max_withdraw_by_flow' => $flow['flow_unlimited'] ? null : $flow['max_withdraw_by_flow'],
'flow_unlimited' => $flow['flow_unlimited'],
],
]);
}
@@ -32,9 +51,9 @@ class Wallet extends MobileBase
if ($response !== null) {
return $response;
}
$type = trim((string) $request->get('type', 'all'));
$page = $this->intValue($request->get('page', 1), 1);
$pageSize = $this->intValue($request->get('page_size', 20), 20);
$type = trim((string) $request->input('type', 'all'));
$page = $this->intValue($request->input('page', 1), 1);
$pageSize = $this->intValue($request->input('page_size', 20), 20);
$query = UserWalletRecord::where('user_id', $this->auth->id)->order('id', 'desc');
if ($type !== '' && $type !== 'all') {

View File

@@ -12,7 +12,7 @@ return [
'Please login first' => 'Please login first',
'You have no permission' => 'No permission to operate',
'Captcha error' => 'Captcha error!',
'ok' => 'ok',
'ok' => 'success',
'Missing parameters' => 'Missing parameters',
'Invalid parameter format' => 'Invalid parameter format',
'Invalid parameter value' => 'Invalid parameter value',
@@ -38,6 +38,14 @@ return [
'Current process does not allow this operation' => 'Current process does not allow this operation',
'Order does not exist' => 'Order does not exist',
'Notice does not exist' => 'Notice does not exist',
// Deposit / Withdraw
'Idempotency key is too long' => 'Idempotency key is too long',
'Idempotency key conflict' => 'Idempotency key conflict, please do not submit repeatedly',
'Deposit tier not available' => 'The selected deposit tier is not available',
'Order not found after settle' => 'Order not found after settlement',
'Invalid withdraw amount' => 'Invalid withdraw amount',
'Withdraw exceeds available bet flow' => 'The withdraw amount exceeds the available bet-flow quota',
'Too many pending withdraw orders' => 'You already have withdraw orders under review, please wait for them to be processed',
// Member center account
'Data updated successfully~' => 'Data updated successfully~',
'Password has been changed~' => 'Password has been changed~',

View File

@@ -70,6 +70,14 @@ return [
'Current process does not allow this operation' => '当前流程不允许该操作',
'Order does not exist' => '订单不存在',
'Notice does not exist' => '公告不存在',
// 充值 / 提现
'Idempotency key is too long' => '幂等键过长',
'Idempotency key conflict' => '幂等键冲突(请勿重复提交)',
'Deposit tier not available' => '所选充值档位不可用',
'Order not found after settle' => '充值成功后未找到订单',
'Invalid withdraw amount' => '提现金额不合法',
'Withdraw exceeds available bet flow' => '提现金额超出可提现额度',
'Too many pending withdraw orders' => '用户当前存在多笔提现订单,请等待审核',
// 会员中心 account
'Data updated successfully~' => '资料更新成功~',
'Password has been changed~' => '密码已修改~',

View File

@@ -0,0 +1,218 @@
<?php
declare(strict_types=1);
namespace app\common\library\finance;
use RuntimeException;
use support\think\Db;
use Throwable;
/**
* 充值订单结算公共库
*
* 所有"把 deposit_order 变为成功并给玩家钱包加币"的逻辑必须收敛到这里,
* 以便 mock 支付瞬时成功、未来第三方网关回调、历史数据的人工补单共用同一事务边界。
*
* 关键约束:
* - 只结算 status=0 的订单,幂等;重复调用同一订单返回现有结算结果;
* - 钱包流水 user_wallet_record 以 "deposit_settle_{order_no}" 为 idempotency_key保证不重复入账
* - 同时更新 user.coin 与 update_timeuser_wallet_record 记录 balance_before/after 快照。
*/
final class DepositSettlement
{
public const SOURCE_MOCK_GATEWAY = 'mock_gateway';
public const SOURCE_ADMIN_APPROVE = 'admin_approve';
public const SOURCE_THIRD_PARTY = 'third_party';
/**
* 结算指定订单。
*
* @param int $orderId deposit_order.id
* @param string $source 来源SOURCE_* 常量),写入 remark
* @param string $sourceLabel 人类可读描述,写入 remark如 "mock gateway auto settled"
* @param int|null $operatorAdminId 操作管理员 ID仅管理员审核时有值
* @param string|null $extraRemark 追加到订单 remark可选
*
* @return array{
* order_id: int,
* order_no: string,
* amount: string,
* balance_before: string,
* balance_after: string,
* pay_time: int,
* already_settled: bool,
* }
*
* @throws RuntimeException 订单不存在、金额非法、并发冲突等
*/
public static function settle(
int $orderId,
string $source,
string $sourceLabel,
?int $operatorAdminId = null,
?string $extraRemark = null
): array {
if ($orderId <= 0) {
throw new RuntimeException('订单 ID 非法');
}
$order = Db::name('deposit_order')->where('id', $orderId)->find();
if (!$order) {
throw new RuntimeException('订单不存在');
}
$orderNo = is_string($order['order_no']) ? $order['order_no'] : strval($order['order_no']);
if ($orderNo === '') {
throw new RuntimeException('订单号为空');
}
$statusRaw = $order['status'] ?? 0;
$status = is_numeric($statusRaw) ? intval($statusRaw) : 0;
// 如果已结算,直接返回已有结果(幂等)
if ($status === 1) {
$userId = is_numeric($order['user_id'] ?? null) ? intval($order['user_id']) : 0;
$coinAfter = '0.0000';
if ($userId > 0) {
$coin = Db::name('user')->where('id', $userId)->value('coin');
$coinAfter = is_string($coin) ? $coin : strval($coin);
}
$amt = self::amountString($order['amount'] ?? '0');
$bns = self::amountString($order['bonus_amount'] ?? '0');
return [
'order_id' => $orderId,
'order_no' => $orderNo,
'amount' => $amt,
'bonus_amount' => $bns,
'credit' => bcadd($amt, $bns, 4),
'balance_before' => $coinAfter,
'balance_after' => $coinAfter,
'pay_time' => is_numeric($order['pay_time'] ?? null) ? intval($order['pay_time']) : 0,
'already_settled' => true,
];
}
if ($status !== 0) {
throw new RuntimeException('订单状态不允许结算');
}
$amount = self::amountString($order['amount'] ?? '0');
if (bccomp($amount, '0', 4) <= 0) {
throw new RuntimeException('订单金额异常');
}
$bonus = self::amountString($order['bonus_amount'] ?? '0');
if (bccomp($bonus, '0', 4) < 0) {
$bonus = '0.0000';
}
$credit = bcadd($amount, $bonus, 4);
$userId = is_numeric($order['user_id'] ?? null) ? intval($order['user_id']) : 0;
if ($userId <= 0) {
throw new RuntimeException('订单所属玩家无效');
}
$user = Db::name('user')->where('id', $userId)->find();
if (!$user) {
throw new RuntimeException('玩家不存在');
}
$channelId = is_numeric($order['channel_id'] ?? null) ? intval($order['channel_id']) : null;
$balanceBefore = self::amountString($user['coin'] ?? '0');
$balanceAfter = bcadd($balanceBefore, $credit, 4);
$now = time();
$baseRemark = is_string($order['remark'] ?? null) ? $order['remark'] : '';
// 备注包含充值与赠送的明细,方便后续稽核
$detail = sprintf('amount=%s,bonus=%s,credit=%s', $amount, $bonus, $credit);
$note = sprintf('[%s] %s (%s)', $source, $sourceLabel, $detail);
$combined = $baseRemark === '' ? $note : ($baseRemark . ' | ' . $note);
if ($extraRemark !== null && $extraRemark !== '') {
$combined .= ' | ' . $extraRemark;
}
$finalRemark = mb_substr($combined, 0, 255);
$walletIdem = 'deposit_settle_' . $orderNo;
Db::startTrans();
try {
$affected = Db::name('deposit_order')
->where('id', $orderId)
->where('status', 0)
->update([
'status' => 1,
'pay_time' => $now,
'review_admin_id' => $operatorAdminId,
'review_time' => $operatorAdminId !== null ? $now : null,
'remark' => $finalRemark,
'update_time' => $now,
]);
if ($affected <= 0) {
throw new RuntimeException('订单状态已变更,请刷新后重试');
}
Db::name('user')->where('id', $userId)->update([
'coin' => $balanceAfter,
'update_time' => $now,
]);
$walletExists = Db::name('user_wallet_record')
->where('idempotency_key', $walletIdem)
->value('id');
if (!$walletExists) {
Db::name('user_wallet_record')->insert([
'user_id' => $userId,
'channel_id' => $channelId,
'biz_type' => 'deposit',
'direction' => 1,
'amount' => $credit,
'balance_before' => $balanceBefore,
'balance_after' => $balanceAfter,
'ref_type' => 'deposit_order',
'ref_id' => $orderId,
'idempotency_key' => $walletIdem,
'operator_admin_id' => $operatorAdminId,
'remark' => mb_substr($note, 0, 500),
'create_time' => $now,
]);
}
Db::commit();
} catch (Throwable $e) {
Db::rollback();
throw new RuntimeException($e->getMessage());
}
return [
'order_id' => $orderId,
'order_no' => $orderNo,
'amount' => $amount,
'bonus_amount' => $bonus,
'credit' => $credit,
'balance_before' => $balanceBefore,
'balance_after' => $balanceAfter,
'pay_time' => $now,
'already_settled' => false,
];
}
/**
* 将任意数值输入格式化为 4 位小数字符串(不做强制类型转换)
*/
private static function amountString($raw): string
{
if (is_string($raw)) {
$s = trim($raw);
} elseif (is_int($raw) || is_float($raw)) {
$s = strval($raw);
} else {
return '0.0000';
}
if (!is_numeric($s)) {
return '0.0000';
}
return bcadd($s, '0', 4);
}
}

View File

@@ -0,0 +1,164 @@
<?php
declare(strict_types=1);
namespace app\common\library\finance;
use support\think\Db;
/**
* 提现打码量(流水)门槛工具库
*
* 业务口径(打码量即提现配额模型):
* - 每笔提现消耗等额打码配额:折算 = withdraw_coin × ratio
* - lifetime_withdrawable_from_flow = bet_flow_coin / ratio
* - max_withdraw_by_flow = max(0, lifetime_withdrawable_from_flow - total_withdraw_coin)
* - 单笔上限max_withdrawable = min(coin_balance, max_withdraw_by_flow)
* - ratio 来自 game_config.withdraw_bet_flow_ratioratio = 0 代表不限制打码量,此时
* max_withdraw_by_flow 视为"无限大"(由 UNLIMITED_FLOW 哨兵值表示API 层兜底用余额)
*
* 向后兼容:原门槛 bet_flow_coin >= (total_deposit - total_withdraw) × ratio 已被
* "单笔上限 ≤ max_withdraw_by_flow" 取代且语义等价更细腻:任何通过新校验的请求必然
* 也满足旧门槛口径。字段 required_bet_flow / remaining_bet_flow / eligible 保留仅作展示。
*/
final class WithdrawFlow
{
public const CONFIG_KEY = 'withdraw_bet_flow_ratio';
public const DEFAULT_RATIO = '1.0000';
/** 当 ratio = 0不限打码max_withdraw_by_flow 用此哨兵表示"无限"。14 位整数位足够覆盖任何业务金额。 */
public const UNLIMITED_FLOW = '99999999999999.9999';
/** 单用户最多允许同时存在的「待审核」(withdraw_order.status=0) 提现订单数。 */
public const MAX_PENDING_WITHDRAW = 3;
/**
* 读取当前打码倍数(字符串 4 位小数,至少 0
*/
public static function ratio(): string
{
$row = Db::name('game_config')->where('config_key', self::CONFIG_KEY)->find();
if (!$row) {
return self::DEFAULT_RATIO;
}
$val = $row['config_value'] ?? '';
if (!is_string($val) || trim($val) === '' || !is_numeric(trim($val))) {
return self::DEFAULT_RATIO;
}
$normalized = bcadd(trim($val), '0', 4);
if (bccomp($normalized, '0', 4) < 0) {
return '0.0000';
}
return $normalized;
}
/**
* 归一化金额字段到 4 位小数字符串,非法输入返回 '0.0000'
*/
public static function amountString($raw): string
{
if ($raw === null || $raw === '') {
return '0.0000';
}
if (is_string($raw)) {
$s = trim($raw);
} elseif (is_int($raw) || is_float($raw)) {
$s = strval($raw);
} else {
return '0.0000';
}
if (!is_numeric($s)) {
return '0.0000';
}
return bcadd($s, '0', 4);
}
/**
* 核算玩家当前打码量状态
*
* @param array{
* total_deposit_coin?: mixed,
* total_withdraw_coin?: mixed,
* bet_flow_coin?: mixed,
* }|null $userSnapshot 允许外部传入字典(节省一次查询);为 null 时按 $userId 从库取
*
* @return array{
* ratio: string,
* net_deposit: string,
* required_bet_flow: string,
* bet_flow_coin: string,
* remaining_bet_flow: string,
* eligible: bool,
* max_withdraw_by_flow: string,
* flow_unlimited: bool,
* }
*/
public static function status(?int $userId, ?array $userSnapshot = null): array
{
if ($userSnapshot === null && $userId !== null) {
$userSnapshot = Db::name('user')
->field(['total_deposit_coin', 'total_withdraw_coin', 'bet_flow_coin'])
->where('id', $userId)
->find();
}
$userSnapshot = is_array($userSnapshot) ? $userSnapshot : [];
$deposit = self::amountString($userSnapshot['total_deposit_coin'] ?? '0');
$withdraw = self::amountString($userSnapshot['total_withdraw_coin'] ?? '0');
$flow = self::amountString($userSnapshot['bet_flow_coin'] ?? '0');
$net = bcsub($deposit, $withdraw, 4);
if (bccomp($net, '0', 4) < 0) {
$net = '0.0000';
}
$ratio = self::ratio();
$required = bcmul($net, $ratio, 4);
$remaining = bcsub($required, $flow, 4);
if (bccomp($remaining, '0', 4) < 0) {
$remaining = '0.0000';
}
$eligible = bccomp($flow, $required, 4) >= 0;
// max_withdraw_by_flow = max(0, bet_flow_coin / ratio - total_withdraw_coin)
$unlimited = bccomp($ratio, '0', 4) === 0;
if ($unlimited) {
$maxByFlow = self::UNLIMITED_FLOW;
} else {
$lifetime = bcdiv($flow, $ratio, 4);
$maxByFlow = bcsub($lifetime, $withdraw, 4);
if (bccomp($maxByFlow, '0', 4) < 0) {
$maxByFlow = '0.0000';
}
}
return [
'ratio' => $ratio,
'net_deposit' => $net,
'required_bet_flow' => $required,
'bet_flow_coin' => $flow,
'remaining_bet_flow' => $remaining,
'eligible' => $eligible,
'max_withdraw_by_flow' => $maxByFlow,
'flow_unlimited' => $unlimited,
];
}
/**
* 取单笔最大可提现额 = min(coin_balance, max_withdraw_by_flow)。
* 返回值为 4 位小数字符串,已与 ratio=0不限逻辑兼容。
*/
public static function maxWithdrawable(string $coinBalance, array $flowStatus): string
{
$coin = self::amountString($coinBalance);
if (bccomp($coin, '0', 4) < 0) {
$coin = '0.0000';
}
if (!empty($flowStatus['flow_unlimited'])) {
return $coin;
}
$byFlow = self::amountString($flowStatus['max_withdraw_by_flow'] ?? '0');
return bccomp($coin, $byFlow, 4) <= 0 ? $coin : $byFlow;
}
}

View File

@@ -0,0 +1,351 @@
<?php
declare(strict_types=1);
namespace app\common\library\game;
use InvalidArgumentException;
/**
* 充值档位game_config.deposit_tier仅存 JSON 数组
*
* 每一项字段mock/第三方支付模式,已不再保存收款账户信息;支持中英文双语):
* - id : string档位稳定 ID如 t_xxxxxxxx
* - title : string档位中文名称必填前端中文环境展示
* - title_en : string档位英文名称可选前端英文环境展示为空时回退到 title
* - amount : string充值金额4 位小数)
* - bonus_amount : string赠送金额4 位小数,可为 0
* - desc : string档位中文描述可空<=255
* - desc_en : string档位英文描述可空<=255为空时回退到 desc
* - sort : int排序权重小值在前
* - status : int0=停用1=启用
*
* 历史数据兼容:老字段 name 会在 title 缺失时作为 title 兜底(更老的 account_name 亦会兜底)。
*/
final class DepositTier
{
public const CONFIG_KEY = 'deposit_tier';
/**
* 从 game_config.config_value 中解析出档位数组(容错)
*
* @return list<array{
* id: string,
* title: string,
* title_en: string,
* amount: string,
* bonus_amount: string,
* desc: string,
* desc_en: string,
* sort: int,
* status: int,
* }>
*/
public static function parseFromConfigValue($raw): array
{
if (!is_string($raw) || trim($raw) === '') {
return [];
}
$decoded = json_decode($raw, true);
if (!is_array($decoded)) {
return [];
}
if (isset($decoded['tiers']) && is_array($decoded['tiers'])) {
$list = $decoded['tiers'];
} else {
$list = $decoded;
}
return self::normalizeList($list);
}
/**
* @param list<mixed> $items
*/
public static function normalizeList(array $items): array
{
$out = [];
foreach ($items as $row) {
if (!is_array($row)) {
continue;
}
$id = isset($row['id']) && is_string($row['id']) ? trim($row['id']) : '';
if ($id === '') {
$id = self::generateId();
}
$title = self::stringField($row, 'title');
if ($title === '') {
// 兼容历史:字段名 name 或更老的 account_name
$title = self::stringField($row, 'name');
if ($title === '') {
$title = self::stringField($row, 'account_name');
}
}
$titleEn = self::stringField($row, 'title_en');
$amount = self::normalizeAmount($row['amount'] ?? '');
$bonus = self::normalizeAmount($row['bonus_amount'] ?? '0');
$desc = self::stringField($row, 'desc');
if ($desc === '') {
$desc = self::stringField($row, 'remark');
}
$descEn = self::stringField($row, 'desc_en');
$sort = isset($row['sort']) && is_numeric($row['sort']) ? intval($row['sort']) : 0;
$status = isset($row['status']) && is_numeric($row['status']) ? intval($row['status']) : 1;
$status = $status === 1 ? 1 : 0;
$out[] = [
'id' => $id,
'title' => $title,
'title_en' => $titleEn,
'amount' => $amount,
'bonus_amount' => $bonus,
'desc' => $desc,
'desc_en' => $descEn,
'sort' => $sort,
'status' => $status,
];
}
usort($out, static function (array $a, array $b): int {
if ($a['sort'] !== $b['sort']) {
return $a['sort'] <=> $b['sort'];
}
$ida = is_string($a['id']) ? $a['id'] : '';
$idb = is_string($b['id']) ? $b['id'] : '';
return strcmp($ida, $idb);
});
return $out;
}
/**
* 校验 POST 数据并输出用于入库的清洁数据
*
* @param list<array<string, mixed>> $items
*
* @throws InvalidArgumentException
*/
public static function prepareItemsForSave(array $items): array
{
$seenId = [];
$out = [];
foreach ($items as $idx => $row) {
$no = $idx + 1;
if (!is_array($row)) {
throw new InvalidArgumentException('第 ' . $no . ' 行格式错误');
}
$id = isset($row['id']) && is_string($row['id']) ? trim($row['id']) : '';
if ($id === '') {
$id = self::generateId();
}
if (!preg_match('/^[a-zA-Z0-9_\-]{1,32}$/', $id)) {
throw new InvalidArgumentException('第 ' . $no . ' 行 ID 非法');
}
if (isset($seenId[$id])) {
throw new InvalidArgumentException('档位 ID 重复:' . $id);
}
$seenId[$id] = true;
$title = self::stringField($row, 'title');
if ($title === '') {
// 兼容上游(例如自动迁移脚本)传递历史 name 字段
$title = self::stringField($row, 'name');
}
if ($title === '') {
throw new InvalidArgumentException('第 ' . $no . ' 行中文充值名称不能为空');
}
if (mb_strlen($title) > 64) {
throw new InvalidArgumentException('第 ' . $no . ' 行中文充值名称过长');
}
$titleEn = self::stringField($row, 'title_en');
if (mb_strlen($titleEn) > 64) {
throw new InvalidArgumentException('第 ' . $no . ' 行英文充值名称过长');
}
$amount = self::normalizeAmount($row['amount'] ?? '');
if (bccomp($amount, '0', 4) <= 0) {
throw new InvalidArgumentException('第 ' . $no . ' 行充值金额必须大于 0');
}
$bonus = self::normalizeAmount($row['bonus_amount'] ?? '0');
if (bccomp($bonus, '0', 4) < 0) {
throw new InvalidArgumentException('第 ' . $no . ' 行赠送金额不能为负数');
}
$desc = self::stringField($row, 'desc');
if (mb_strlen($desc) > 255) {
throw new InvalidArgumentException('第 ' . $no . ' 行中文描述过长');
}
$descEn = self::stringField($row, 'desc_en');
if (mb_strlen($descEn) > 255) {
throw new InvalidArgumentException('第 ' . $no . ' 行英文描述过长');
}
$sort = isset($row['sort']) && is_numeric($row['sort']) ? intval($row['sort']) : 0;
$statusRaw = isset($row['status']) && is_numeric($row['status']) ? intval($row['status']) : 1;
$status = $statusRaw === 1 ? 1 : 0;
$out[] = [
'id' => $id,
'title' => $title,
'title_en' => $titleEn,
'amount' => $amount,
'bonus_amount' => $bonus,
'desc' => $desc,
'desc_en' => $descEn,
'sort' => $sort,
'status' => $status,
];
}
usort($out, static function (array $a, array $b): int {
if ($a['sort'] !== $b['sort']) {
return $a['sort'] <=> $b['sort'];
}
$ida = is_string($a['id']) ? $a['id'] : '';
$idb = is_string($b['id']) ? $b['id'] : '';
return strcmp($ida, $idb);
});
return $out;
}
/**
* @param list<array<string, mixed>> $items
*/
public static function encodeForDb(array $items): string
{
$encoded = json_encode($items, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
if ($encoded === false) {
throw new InvalidArgumentException('JSON 编码失败');
}
return $encoded;
}
/**
* 过滤出启用档位并按 sort 升序,供移动端选择
*/
public static function publicList(array $items): array
{
$enabled = array_values(array_filter($items, static function (array $row): bool {
if (!isset($row['status'])) {
return false;
}
$val = is_numeric($row['status']) ? intval($row['status']) : 0;
return $val === 1;
}));
usort($enabled, static function (array $a, array $b): int {
$sa = isset($a['sort']) && is_numeric($a['sort']) ? intval($a['sort']) : 0;
$sb = isset($b['sort']) && is_numeric($b['sort']) ? intval($b['sort']) : 0;
if ($sa !== $sb) {
return $sa <=> $sb;
}
$ida = isset($a['id']) && is_string($a['id']) ? $a['id'] : '';
$idb = isset($b['id']) && is_string($b['id']) ? $b['id'] : '';
return strcmp($ida, $idb);
});
return $enabled;
}
/**
* 按 ID 从档位列表中取出指定档位;未找到返回 null
*/
public static function findById(array $items, string $id): ?array
{
foreach ($items as $row) {
if (!is_array($row)) {
continue;
}
$rid = $row['id'] ?? '';
if (is_string($rid) && $rid === $id) {
return $row;
}
}
return null;
}
/**
* 根据语言选择档位对外展示的 title/desc。
*
* @param array<string, mixed> $item
* @return array{title: string, desc: string}
*/
public static function localize(array $item, string $lang): array
{
$title = self::stringField($item, 'title');
$titleEn = self::stringField($item, 'title_en');
$desc = self::stringField($item, 'desc');
$descEn = self::stringField($item, 'desc_en');
$isEn = self::isEnglishLang($lang);
$pickedTitle = $isEn ? ($titleEn !== '' ? $titleEn : $title) : ($title !== '' ? $title : $titleEn);
$pickedDesc = $isEn ? ($descEn !== '' ? $descEn : $desc) : ($desc !== '' ? $desc : $descEn);
return [
'title' => $pickedTitle,
'desc' => $pickedDesc,
];
}
/**
* 生成 10 位稳定 IDt_ + 8 位随机 base32
*/
public static function generateId(): string
{
$chars = 'abcdefghijkmnpqrstuvwxyz23456789';
$len = strlen($chars);
$id = 't_';
for ($i = 0; $i < 8; $i++) {
$id .= $chars[random_int(0, $len - 1)];
}
return $id;
}
/**
* 将金额归一化为 4 位小数字符串;非法输入返回 '0.0000'
*/
public static function normalizeAmount($raw): string
{
if ($raw === null || $raw === '') {
return '0.0000';
}
if (is_string($raw)) {
$s = trim($raw);
} elseif (is_int($raw) || is_float($raw)) {
$s = strval($raw);
} else {
return '0.0000';
}
$s = str_replace(',', '.', $s);
if (!is_numeric($s)) {
return '0.0000';
}
return bcadd($s, '0', 4);
}
/**
* 从数组取字符串字段并 trim非字符串返回空串
*
* @param array<string, mixed> $row
*/
private static function stringField(array $row, string $key): string
{
if (!isset($row[$key])) {
return '';
}
$v = $row[$key];
return is_string($v) ? trim($v) : '';
}
private static function isEnglishLang(string $lang): bool
{
$normalized = strtolower(str_replace('_', '-', trim($lang)));
if ($normalized === '') {
return false;
}
return $normalized === 'en' || str_starts_with($normalized, 'en-');
}
}

View File

@@ -16,12 +16,10 @@ class BetOrder extends Model
'create_time' => 'integer',
'update_time' => 'integer',
'pick_numbers' => 'json',
'unit_amount' => 'string',
'total_amount' => 'string',
'win_amount' => 'string',
'jackpot_extra_amount' => 'string',
'status' => 'integer',
'pick_count' => 'integer',
'streak_at_bet' => 'integer',
'is_auto' => 'integer',
];

View File

@@ -42,7 +42,8 @@ class User extends Model
'update_time' => 'integer',
'coin' => 'string',
'total_deposit_coin' => 'string',
'total_valid_bet_coin' => 'string',
'total_withdraw_coin' => 'string',
'bet_flow_coin' => 'string',
'risk_flags' => 'integer',
'current_streak' => 'integer',
];

View File

@@ -56,6 +56,9 @@ final class GameBetSettleService
continue;
}
// 结算刚刚成功status 1 → 2把本单下注总额 1:1 累加到用户打码量
self::creditUserBetFlow($bet, $now);
if (bccomp($win, '0', 4) <= 0) {
continue;
}
@@ -106,7 +109,7 @@ final class GameBetSettleService
}
/**
* 单注应付派彩:命中开奖号码 unit × (连胜+1) × 33与 GameLiveService 一致)。
* 应付派彩:开奖号码 ∈ pick_numbers 即中奖;整笔 total_amount × (连胜+1) × 33与 GameLiveService 一致)。
*/
public static function computeWinAmount(array $bet, int $resultNumber): string
{
@@ -121,11 +124,41 @@ final class GameBetSettleService
if (!in_array($resultNumber, array_map('intval', $pickNumbers), true)) {
return '0.0000';
}
$unit = (string) ($bet['unit_amount'] ?? '0');
$total = (string) ($bet['total_amount'] ?? '0');
$streak = (int) ($bet['streak_at_bet'] ?? 0);
$odds = (string) (($streak + 1) * self::BASE_ODDS);
return bcmul($unit, $odds, 4);
return bcmul($total, $odds, 4);
}
/**
* 累加玩家打码量(流水):按本注单 total_amount 1:1 加到 user.bet_flow_coin。
*
* 幂等性由调用点保证:只有 bet_order 首次从 status=1 变更为 status=2返回 $affected=1
* 时才会调用本方法,重复结算不会触发。
*/
private static function creditUserBetFlow(array $bet, int $now): void
{
$userId = isset($bet['user_id']) && is_numeric($bet['user_id']) ? intval($bet['user_id']) : 0;
if ($userId <= 0) {
return;
}
$totalRaw = $bet['total_amount'] ?? '0';
$total = is_string($totalRaw) ? trim($totalRaw) : (is_numeric($totalRaw) ? strval($totalRaw) : '0');
if ($total === '' || !is_numeric($total)) {
return;
}
$flow = bcadd($total, '0', 4);
if (bccomp($flow, '0', 4) <= 0) {
return;
}
// 原子加法:避免读-改-写导致的并发覆盖;$flow 已由 bcadd 归一化为纯数字字符串,不存在 SQL 注入
Db::name('user')
->where('id', $userId)
->update([
'bet_flow_coin' => Db::raw('bet_flow_coin + ' . $flow),
'update_time' => $now,
]);
}
private static function creditUserPayout(array $bet, int $betId, string $winAmount, int $now): void

View File

@@ -89,7 +89,6 @@ final class GameLiveService
'user_id' => (int) $row['user_id'],
'period_no' => (string) $row['period_no'],
'pick_numbers' => $row['pick_numbers'],
'unit_amount' => (string) $row['unit_amount'],
'total_amount' => (string) $row['total_amount'],
'streak_at_bet' => (int) $row['streak_at_bet'],
'create_time' => (int) $row['create_time'],
@@ -303,10 +302,10 @@ final class GameLiveService
if (!in_array($number, array_map('intval', $pickNumbers), true)) {
continue;
}
$unit = (string) ($bet['unit_amount'] ?? '0');
$total = (string) ($bet['total_amount'] ?? '0');
$streak = (int) ($bet['streak_at_bet'] ?? 0);
$odds = (string) (($streak + 1) * self::BASE_ODDS);
$orderPayout = bcmul($unit, $odds, 4);
$orderPayout = bcmul($total, $odds, 4);
$payout = bcadd($payout, $orderPayout, 4);
}
return $payout;

View File

@@ -82,7 +82,7 @@ final class GameRecordStatService
}
/**
* 与 GameLiveService::estimateLossForNumber 中单注派彩一致:命中号码时 unit × (streak+1) × 33。
* 与 GameLiveService::estimateLossForNumber 中派彩一致:命中号码时 total_amount × (streak+1) × 33。
*/
private static function estimatePayoutForBet(array $bet, int $resultNumber): string
{
@@ -97,10 +97,10 @@ final class GameRecordStatService
if (!in_array($resultNumber, array_map('intval', $pickNumbers), true)) {
return '0.0000';
}
$unit = (string) ($bet['unit_amount'] ?? '0');
$total = (string) ($bet['total_amount'] ?? '0');
$streak = (int) ($bet['streak_at_bet'] ?? 0);
$odds = (string) (($streak + 1) * self::BASE_ODDS);
return bcmul($unit, $odds, 4);
return bcmul($total, $odds, 4);
}
}

View File

@@ -112,36 +112,40 @@ Route::post('/api/account/retrievePassword', [\app\api\controller\Account::class
Route::post('/api/ems/send', [\app\api\controller\Ems::class, 'send']);
// ==================== 移动端用户接口(统一收口到 /api/user/* ====================
// 约定:移动端所有业务接口一律使用 POST 调用;查询类同时兼容 GET 便于浏览器调试。
Route::post('/api/user/register', [\app\api\controller\Auth::class, 'userRegister']);
Route::post('/api/user/login', [\app\api\controller\Auth::class, 'userLogin']);
Route::post('/api/user/refreshToken', [\app\api\controller\Auth::class, 'tokenRefresh']);
Route::get('/api/user/profile', [\app\api\controller\Account::class, 'userProfile']);
Route::add(['GET', 'POST'], '/api/user/profile', [\app\api\controller\Account::class, 'userProfile']);
Route::post('/api/user/retrievePassword', [\app\api\controller\Account::class, 'retrievePassword']);
// 兼容旧移动端路径,后续客户端切换完成后可移除
Route::post('/api/auth/userRegister', [\app\api\controller\Auth::class, 'userRegister']);
Route::post('/api/auth/userLogin', [\app\api\controller\Auth::class, 'userLogin']);
Route::post('/api/auth/tokenRefresh', [\app\api\controller\Auth::class, 'tokenRefresh']);
Route::get('/api/account/userProfile', [\app\api\controller\Account::class, 'userProfile']);
Route::add(['GET', 'POST'], '/api/account/userProfile', [\app\api\controller\Account::class, 'userProfile']);
Route::get('/api/game/lobbyInit', [\app\api\controller\Game::class, 'lobbyInit']);
Route::get('/api/game/dictionaryList', [\app\api\controller\Game::class, 'dictionaryList']);
Route::get('/api/game/periodHistory', [\app\api\controller\Game::class, 'periodHistory']);
Route::get('/api/game/periodCurrent', [\app\api\controller\Game::class, 'periodCurrent']);
Route::add(['GET', 'POST'], '/api/game/lobbyInit', [\app\api\controller\Game::class, 'lobbyInit']);
Route::add(['GET', 'POST'], '/api/game/dictionaryList', [\app\api\controller\Game::class, 'dictionaryList']);
Route::add(['GET', 'POST'], '/api/game/periodHistory', [\app\api\controller\Game::class, 'periodHistory']);
Route::add(['GET', 'POST'], '/api/game/periodCurrent', [\app\api\controller\Game::class, 'periodCurrent']);
Route::post('/api/game/betPlace', [\app\api\controller\Game::class, 'betPlace']);
Route::get('/api/game/betMyOrders', [\app\api\controller\Game::class, 'betMyOrders']);
Route::add(['GET', 'POST'], '/api/game/betMyOrders', [\app\api\controller\Game::class, 'betMyOrders']);
Route::get('/api/wallet/balanceSummary', [\app\api\controller\Wallet::class, 'balanceSummary']);
Route::get('/api/wallet/recordList', [\app\api\controller\Wallet::class, 'recordList']);
Route::add(['GET', 'POST'], '/api/wallet/balanceSummary', [\app\api\controller\Wallet::class, 'balanceSummary']);
Route::add(['GET', 'POST'], '/api/wallet/recordList', [\app\api\controller\Wallet::class, 'recordList']);
Route::add(['GET', 'POST'], '/api/finance/depositTierList', [\app\api\controller\Finance::class, 'depositTierList']);
Route::post('/api/finance/depositCreate', [\app\api\controller\Finance::class, 'depositCreate']);
Route::get('/api/finance/depositDetail', [\app\api\controller\Finance::class, 'depositDetail']);
Route::add(['GET', 'POST'], '/api/finance/depositDetail', [\app\api\controller\Finance::class, 'depositDetail']);
Route::add(['GET', 'POST'], '/api/finance/depositList', [\app\api\controller\Finance::class, 'depositList']);
Route::post('/api/finance/withdrawCreate', [\app\api\controller\Finance::class, 'withdrawCreate']);
Route::get('/api/finance/withdrawDetail', [\app\api\controller\Finance::class, 'withdrawDetail']);
Route::add(['GET', 'POST'], '/api/finance/withdrawDetail', [\app\api\controller\Finance::class, 'withdrawDetail']);
Route::add(['GET', 'POST'], '/api/finance/withdrawList', [\app\api\controller\Finance::class, 'withdrawList']);
Route::get('/api/notice/noticeList', [\app\api\controller\Notice::class, 'noticeList']);
Route::get('/api/notice/noticeDetail', [\app\api\controller\Notice::class, 'noticeDetail']);
Route::post('/api/notice/noticeConfirm', [\app\api\controller\Notice::class, 'noticeConfirm']);
Route::get('/api/notice/noticeConfirm', [\app\api\controller\Notice::class, 'noticeConfirm']);
// ==================== Admin 路由 ====================
// Admin 多为 JSON API前端可能用 GET 传参查列表、POST 提交表单,使用 any 确保兼容

View File

@@ -0,0 +1,29 @@
export default {
title: 'Deposit Tiers',
desc: 'Configure the deposit tiers players can pick when creating a deposit order. In the third-party payment mode, only tier specs (name, amount, bonus, description) are maintained; receiving accounts are no longer stored here. Maintain both Chinese and English text for the title and description: the mobile API returns the language matching the request `lang` header, falling back to Chinese if English is blank. Changes take effect immediately.',
btn_add: 'Add Tier',
btn_save: 'Save',
btn_remove: 'Delete',
confirm_remove: 'Delete this deposit tier?',
tier_id: 'Tier ID',
auto_id: '(generated on save)',
sort: 'Sort',
status: 'Enabled',
title_col: 'Title (ZH)',
title_ph: 'e.g. 新手首充、VIP 高额充值',
title_en_col: 'Title (EN)',
title_en_ph: 'e.g. Starter Pack, VIP Recharge',
amount: 'Amount',
amount_ph: 'e.g. 100.00',
bonus_amount: 'Bonus',
bonus_ph: 'e.g. 20.00, use 0 if none',
desc_col: 'Description (ZH)',
desc_ph: 'Optional Chinese description, up to 255 chars',
desc_en_col: 'Description (EN)',
desc_en_ph: 'Optional English description, up to 255 chars',
currency: '',
operate: 'Action',
err_title: 'Row {no}: Chinese title is required',
err_amount: 'Row {no}: amount must be a number greater than 0',
err_bonus: 'Row {no}: bonus must be a number no less than 0',
}

View File

@@ -6,9 +6,7 @@ export default {
user_id: 'User ID',
channel_id: 'Channel ID',
pick_numbers: 'Picks',
unit_amount: 'Unit amount',
pick_count: 'Pick count',
total_amount: 'Total',
total_amount: 'Total bet amount',
streak_at_bet: 'Streak at bet',
is_auto: 'Auto',
'is_auto 0': 'Manual',

View File

@@ -18,6 +18,6 @@ export default {
bet_id: 'Bet ID',
user_id: 'Player ID',
pick_numbers: 'Pick numbers',
unit_amount: 'Unit amount',
total_amount: 'Total bet amount',
streak_at_bet: 'Streak at bet',
}

View File

@@ -11,7 +11,8 @@ export default {
coin: 'Coin balance',
coin_placeholder: 'decimal(18,4)',
total_deposit_coin: 'Total deposit (coin)',
total_valid_bet_coin: 'Total valid bet (coin)',
total_withdraw_coin: 'Total withdraw (coin)',
bet_flow_coin: 'Bet flow (coin)',
risk_flags: 'Risk',
risk_none: 'None',
risk_no_login: 'No login',

View File

@@ -6,9 +6,7 @@
user_id: 'User ID',
channel_id: 'Channel ID',
pick_numbers: 'Picks',
unit_amount: 'Unit amount',
pick_count: 'Pick count',
total_amount: 'Total',
total_amount: 'Total bet amount',
streak_at_bet: 'Streak at bet',
is_auto: 'Auto',
'is_auto 0': 'Manual',

View File

@@ -1,10 +1,13 @@
export default {
'quick Search Fields': 'Order No./User ID/Pay channel',
'quick Search Fields': 'Order No./User ID/Pay channel/Tier/Idempotency key',
id: 'ID',
order_no: 'Order No.',
idempotency_key: 'Idempotency key',
user_id: 'User ID',
channel_id: 'Channel ID',
amount: 'Amount',
bonus_amount: 'Bonus',
total_credit: 'Total credit',
status: 'Status',
'status 0': 'Pending',
'status 1': 'Success',
@@ -12,9 +15,12 @@ export default {
'status 3': 'Canceled',
pay_channel: 'Pay channel',
pay_time: 'Pay time',
deposit_tier_id: 'Deposit tier',
remark: 'Remark',
create_time: 'Created',
update_time: 'Updated',
user_username: 'Username',
channel_name: 'Channel',
detail_title: 'Deposit Order Detail',
close_btn: 'Close',
}

View File

@@ -17,7 +17,20 @@ export default {
remark: 'Remark',
create_time: 'Created',
update_time: 'Updated',
user_username: 'Username',
user_username: 'User',
channel_name: 'Channel',
review_admin_username: 'Reviewer',
review_title: 'Withdraw review',
review_reject_title: 'Reject withdraw',
review_btn_approve: 'Approve',
review_btn_reject: 'Reject',
review_btn_back: 'Back',
review_btn_confirm_reject: 'Confirm reject',
review_reject_tip: 'Rejected withdrawals will refund the frozen amount back to the user wallet.',
review_reject_placeholder: 'Enter reject reason (visible to the user on mobile history)',
reject_reason_required: 'Please enter reject reason',
already_reviewed: 'This order has already been reviewed',
amount_invalid: 'Apply amount must be greater than 0',
fee_invalid: 'Fee cannot be negative',
fee_exceed_amount: 'Fee cannot exceed apply amount',
}

View File

@@ -11,7 +11,8 @@ export default {
coin: 'Coin balance',
coin_placeholder: 'Amounts are displayed with 2 decimals',
total_deposit_coin: 'Total deposit (coin)',
total_valid_bet_coin: 'Total valid bet (coin)',
total_withdraw_coin: 'Total withdraw (coin)',
bet_flow_coin: 'Bet flow (coin)',
risk_flags: 'Risk',
risk_none: 'None',
risk_no_login: 'No login',

View File

@@ -0,0 +1,29 @@
export default {
title: '充值档位',
desc: '配置玩家创建充值订单时可选的充值档位。第三方支付模式下仅需维护档位规格:名称、充值金额、赠送金额、描述等;不再保存收款账户信息。充值名称/描述需分别维护中英文两套:移动端接口会根据请求头 `lang` 返回对应语言,英文缺省时回退到中文。修改后立即生效。',
btn_add: '新增档位',
btn_save: '保存',
btn_remove: '删除',
confirm_remove: '确定删除该充值档位?',
tier_id: '档位 ID',
auto_id: '(保存时生成)',
sort: '排序',
status: '启用',
title_col: '充值名称(中文)',
title_ph: '例如新手首充、VIP 高额充值',
title_en_col: '充值名称(英文)',
title_en_ph: 'e.g. Starter Pack, VIP Recharge',
amount: '充值金额',
amount_ph: '例如100.00',
bonus_amount: '赠送金额',
bonus_ph: '例如20.00,无赠送填 0',
desc_col: '描述(中文)',
desc_ph: '可选,展示给中文玩家的档位说明,最长 255 字',
desc_en_col: '描述(英文)',
desc_en_ph: 'Optional English description for EN players, up to 255 chars',
currency: '币',
operate: '操作',
err_title: '第 {no} 行:中文充值名称不能为空',
err_amount: '第 {no} 行:充值金额必须为大于 0 的数字',
err_bonus: '第 {no} 行:赠送金额必须为不小于 0 的数字',
}

View File

@@ -6,9 +6,7 @@ export default {
user_id: '用户ID',
channel_id: '渠道ID',
pick_numbers: '选号',
unit_amount: '单号金额',
pick_count: '选号个数',
total_amount: '总金额',
total_amount: '压注总额',
streak_at_bet: '下注时连胜',
is_auto: '托管',
'is_auto 0': '手动',

View File

@@ -18,6 +18,6 @@ export default {
bet_id: '注单ID',
user_id: '玩家ID',
pick_numbers: '压注号码',
unit_amount: '单号金额',
total_amount: '压注总额',
streak_at_bet: '下注时连胜',
}

View File

@@ -11,7 +11,8 @@ export default {
coin: '游戏币余额',
coin_placeholder: 'decimal(18,4),禁止业务用浮点存库',
total_deposit_coin: '累计充值(币)',
total_valid_bet_coin: '累计有效投注(币)',
total_withdraw_coin: '累计提现(币)',
bet_flow_coin: '打码量/流水(币)',
risk_flags: '风控',
risk_none: '无限制',
risk_no_login: '禁止登录',

View File

@@ -6,9 +6,7 @@
user_id: '用户ID',
channel_id: '渠道ID',
pick_numbers: '选号',
unit_amount: '单号金额',
pick_count: '选号个数',
total_amount: '总金额',
total_amount: '压注总额',
streak_at_bet: '下注时连胜',
is_auto: '托管',
'is_auto 0': '手动',

View File

@@ -1,20 +1,26 @@
export default {
'quick Search Fields': '订单号/用户ID/支付通道',
'quick Search Fields': '订单号/用户ID/支付通道/档位ID/幂等键',
id: 'ID',
order_no: '订单号',
idempotency_key: '幂等键',
user_id: '用户ID',
user_username: '用户名',
channel_id: '渠道ID',
channel_name: '渠道',
amount: '金额',
bonus_amount: '赠送金额',
total_credit: '实际到账',
status: '状态',
'status 0': '待处理',
'status 0': '待支付',
'status 1': '成功',
'status 2': '失败',
'status 3': '已取消',
pay_channel: '支付通道',
pay_time: '支付时间',
deposit_tier_id: '充值档位',
remark: '备注',
create_time: '创建时间',
update_time: '更新时间',
detail_title: '充值订单详情',
close_btn: '关闭',
}

View File

@@ -17,7 +17,20 @@ export default {
remark: '备注',
create_time: '创建时间',
update_time: '更新时间',
user_username: '用户',
user_username: '用户',
channel_name: '渠道',
review_admin_username: '审核人',
review_title: '提现审核',
review_reject_title: '提现拒绝',
review_btn_approve: '通过',
review_btn_reject: '拒绝',
review_btn_back: '返回',
review_btn_confirm_reject: '确认拒绝',
review_reject_tip: '拒绝审核后,冻结的提现金额将原路退回用户钱包余额。',
review_reject_placeholder: '请输入拒绝原因,玩家可在提现记录中看到该说明',
reject_reason_required: '请输入拒绝原因',
already_reviewed: '该订单已审核,无需重复操作',
amount_invalid: '申请金额必须大于 0',
fee_invalid: '手续费不能为负',
fee_exceed_amount: '手续费不能大于申请金额',
}

View File

@@ -1,4 +1,4 @@
export default {
export default {
id: 'ID',
username: '用户名',
password: '密码',
@@ -11,7 +11,8 @@
coin: '余额',
coin_placeholder: '金额展示统一两位小数',
total_deposit_coin: '累计充值(币)',
total_valid_bet_coin: '累计有效投注(币)',
total_withdraw_coin: '累计提现(币)',
bet_flow_coin: '打码量/流水(币)',
risk_flags: '风控',
risk_none: '无限制',
risk_no_login: '禁止登录',

View File

@@ -0,0 +1,251 @@
<template>
<div class="default-main ba-table-box deposit-tier-page">
<el-alert type="info" :closable="false" show-icon>
{{ t('config.depositTier.desc') }}
</el-alert>
<div class="toolbar">
<el-button type="primary" :disabled="loading" @click="onAdd">
<Icon name="el-icon-Plus" />
<span class="ml-6">{{ t('config.depositTier.btn_add') }}</span>
</el-button>
<el-button type="success" :loading="saving" :disabled="loading" @click="onSave">
{{ t('config.depositTier.btn_save') }}
</el-button>
</div>
<el-table v-loading="loading" border stripe :data="items" row-key="_rowKey" max-height="720">
<el-table-column prop="sort" :label="t('config.depositTier.sort')" width="100" align="center">
<template #default="{ row }">
<el-input-number v-model="row.sort" :min="0" :max="9999" :controls="false" style="width: 100%" />
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.status')" width="100" align="center">
<template #default="{ row }">
<el-switch v-model="row.status" :active-value="1" :inactive-value="0" />
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.title_col')" min-width="180">
<template #default="{ row }">
<el-input v-model="row.title" maxlength="64" :placeholder="t('config.depositTier.title_ph')" />
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.title_en_col')" min-width="180">
<template #default="{ row }">
<el-input v-model="row.title_en" maxlength="64" :placeholder="t('config.depositTier.title_en_ph')" />
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.amount')" min-width="140">
<template #default="{ row }">
<el-input v-model="row.amount" :placeholder="t('config.depositTier.amount_ph')">
<template #suffix>
<span class="currency">{{ t('config.depositTier.currency') }}</span>
</template>
</el-input>
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.bonus_amount')" min-width="140">
<template #default="{ row }">
<el-input v-model="row.bonus_amount" :placeholder="t('config.depositTier.bonus_ph')">
<template #suffix>
<span class="currency">{{ t('config.depositTier.currency') }}</span>
</template>
</el-input>
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.desc_col')" min-width="220">
<template #default="{ row }">
<el-input v-model="row.desc" maxlength="255" :autosize="{ minRows: 1, maxRows: 3 }" type="textarea" :placeholder="t('config.depositTier.desc_ph')" />
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.desc_en_col')" min-width="220">
<template #default="{ row }">
<el-input v-model="row.desc_en" maxlength="255" :autosize="{ minRows: 1, maxRows: 3 }" type="textarea" :placeholder="t('config.depositTier.desc_en_ph')" />
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.tier_id')" width="140">
<template #default="{ row }">
<el-text class="tier-id" truncated>{{ row.id || t('config.depositTier.auto_id') }}</el-text>
</template>
</el-table-column>
<el-table-column :label="t('config.depositTier.operate')" width="90" align="center" fixed="right">
<template #default="{ $index }">
<el-button type="danger" link @click="onRemove($index)">
{{ t('config.depositTier.btn_remove') }}
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script setup lang="ts">
import { onMounted, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import { ElMessage, ElMessageBox } from 'element-plus'
import createAxios from '/@/utils/axios'
import { auth } from '/@/utils/common'
defineOptions({
name: 'config/depositTier',
})
const { t } = useI18n()
type Tier = {
id: string
title: string
title_en: string
amount: string
bonus_amount: string
desc: string
desc_en: string
sort: number
status: number
_rowKey?: string
}
const loading = ref(false)
const saving = ref(false)
const items = ref<Tier[]>([])
function genRowKey(): string {
return 'r_' + Math.random().toString(36).slice(2, 10)
}
function emptyTier(): Tier {
return {
id: '',
title: '',
title_en: '',
amount: '',
bonus_amount: '0',
desc: '',
desc_en: '',
sort: 0,
status: 1,
_rowKey: genRowKey(),
}
}
async function load() {
loading.value = true
try {
const res = await createAxios({
url: '/admin/config.DepositTier/index',
method: 'get',
})
if (res.code === 1 && res.data) {
const list = (res.data.items || []) as Tier[]
items.value = (Array.isArray(list) ? list : []).map((it) => ({
...emptyTier(),
...it,
_rowKey: genRowKey(),
}))
}
} finally {
loading.value = false
}
}
function onAdd() {
items.value.push(emptyTier())
}
async function onRemove(idx: number) {
try {
await ElMessageBox.confirm(t('config.depositTier.confirm_remove'), t('Warning'), {
type: 'warning',
confirmButtonText: t('Delete'),
cancelButtonText: t('Cancel'),
})
} catch {
return
}
items.value.splice(idx, 1)
}
async function onSave() {
if (!auth('save')) {
return
}
for (let i = 0; i < items.value.length; i++) {
const row = items.value[i]
if (!row.title || !row.title.trim()) {
ElMessage.warning(t('config.depositTier.err_title', { no: i + 1 }))
return
}
const amount = Number(row.amount)
if (!row.amount || Number.isNaN(amount) || amount <= 0) {
ElMessage.warning(t('config.depositTier.err_amount', { no: i + 1 }))
return
}
const bonusRaw = row.bonus_amount === '' || row.bonus_amount === null || row.bonus_amount === undefined ? '0' : row.bonus_amount
const bonus = Number(bonusRaw)
if (Number.isNaN(bonus) || bonus < 0) {
ElMessage.warning(t('config.depositTier.err_bonus', { no: i + 1 }))
return
}
}
saving.value = true
try {
await createAxios({
url: '/admin/config.DepositTier/save',
method: 'post',
data: {
items: items.value.map((r) => ({
id: r.id,
title: r.title,
title_en: r.title_en || '',
amount: r.amount,
bonus_amount: r.bonus_amount === '' || r.bonus_amount === null || r.bonus_amount === undefined ? '0' : r.bonus_amount,
desc: r.desc || '',
desc_en: r.desc_en || '',
sort: r.sort,
status: r.status,
})),
},
showSuccessMessage: true,
})
await load()
} finally {
saving.value = false
}
}
onMounted(() => {
void load()
})
</script>
<style scoped lang="scss">
.deposit-tier-page {
.toolbar {
margin: 12px 0;
display: flex;
gap: 12px;
}
.currency {
color: var(--el-text-color-placeholder);
font-size: 12px;
}
.tier-id {
display: inline-block;
max-width: 120px;
color: var(--el-text-color-secondary);
font-size: 12px;
}
}
</style>

View File

@@ -48,7 +48,7 @@
{{ formatPicks(scope.row.pick_numbers) }}
</template>
</el-table-column>
<el-table-column prop="unit_amount" :label="t('game.live.unit_amount')" width="120" />
<el-table-column prop="total_amount" :label="t('game.live.total_amount')" width="120" />
<el-table-column prop="streak_at_bet" :label="t('game.live.streak_at_bet')" width="90" />
</el-table>
</el-card>

View File

@@ -142,15 +142,6 @@ const baTable = new baTableClass(
operator: false,
formatter: formatPickNumbers,
},
{
label: t('order.betOrder.unit_amount'),
prop: 'unit_amount',
align: 'center',
minWidth: 110,
operator: 'RANGE',
formatter: formatAmount,
},
{ label: t('order.betOrder.pick_count'), prop: 'pick_count', align: 'center', width: 90, operator: 'RANGE' },
{
label: t('order.betOrder.total_amount'),
prop: 'total_amount',

View File

@@ -1,9 +1,9 @@
<template>
<template>
<div class="default-main ba-table-box">
<el-alert class="ba-table-alert" v-if="baTable.table.remark" :title="baTable.table.remark" type="info" show-icon />
<TableHeader
:buttons="['refresh', 'add', 'edit', 'delete', 'comSearch', 'quickSearch', 'columnDisplay']"
:buttons="['refresh', 'comSearch', 'quickSearch', 'columnDisplay']"
:quick-search-placeholder="t('Quick search placeholder', { fields: t('order.depositOrder.quick Search Fields') })"
></TableHeader>
@@ -29,7 +29,19 @@ defineOptions({
const { t } = useI18n()
const tableRef = useTemplateRef('tableRef')
const optButtons: OptButton[] = defaultOptButtons(['edit', 'delete'])
const optButtons: OptButton[] = defaultOptButtons(['edit'])
function formatAmount(_row: anyObj, _column: any, cellValue: unknown) {
if (cellValue === null || cellValue === undefined || cellValue === '') {
return '-'
}
const s = String(cellValue).trim().replace(',', '.')
const n = parseFloat(s)
if (!Number.isFinite(n)) {
return String(cellValue)
}
return n.toFixed(2)
}
const baTable = new baTableClass(
new baTableApi('/admin/order.DepositOrder/'),
@@ -46,12 +58,11 @@ const baTable = new baTableClass(
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
},
{ label: t('order.depositOrder.user_id'), prop: 'user_id', align: 'center', width: 90, operator: 'RANGE' },
{
label: t('order.depositOrder.user_username'),
prop: 'user.username',
align: 'center',
minWidth: 110,
minWidth: 120,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
render: 'tags',
@@ -65,7 +76,22 @@ const baTable = new baTableClass(
operatorPlaceholder: t('Fuzzy query'),
render: 'tags',
},
{ label: t('order.depositOrder.amount'), prop: 'amount', align: 'center', minWidth: 110, operator: 'RANGE' },
{
label: t('order.depositOrder.amount'),
prop: 'amount',
align: 'center',
minWidth: 110,
operator: 'RANGE',
formatter: formatAmount,
},
{
label: t('order.depositOrder.bonus_amount'),
prop: 'bonus_amount',
align: 'center',
minWidth: 110,
operator: 'RANGE',
formatter: formatAmount,
},
{
label: t('order.depositOrder.status'),
prop: 'status',
@@ -76,9 +102,9 @@ const baTable = new baTableClass(
effect: 'dark',
custom: {
'0': 'info',
'1': 'warning',
'2': 'success',
'3': 'danger',
'1': 'success',
'2': 'danger',
'3': 'warning',
},
replaceValue: {
'0': t('order.depositOrder.status 0'),
@@ -91,10 +117,19 @@ const baTable = new baTableClass(
label: t('order.depositOrder.pay_channel'),
prop: 'pay_channel',
align: 'center',
minWidth: 110,
minWidth: 130,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
},
{
label: t('order.depositOrder.deposit_tier_id'),
prop: 'deposit_tier_id',
align: 'center',
minWidth: 120,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
show: false,
},
{
label: t('order.depositOrder.pay_time'),
prop: 'pay_time',
@@ -106,6 +141,16 @@ const baTable = new baTableClass(
width: 170,
timeFormat: 'yyyy-mm-dd hh:MM:ss',
},
{
label: t('order.depositOrder.idempotency_key'),
prop: 'idempotency_key',
align: 'center',
minWidth: 170,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
showOverflowTooltip: true,
show: false,
},
{
label: t('order.depositOrder.remark'),
prop: 'remark',
@@ -136,6 +181,7 @@ const baTable = new baTableClass(
sortable: 'custom',
width: 170,
timeFormat: 'yyyy-mm-dd hh:MM:ss',
show: false,
},
{
label: t('Operate'),
@@ -149,7 +195,7 @@ const baTable = new baTableClass(
],
},
{
defaultItems: { status: 0, amount: '0.0000' },
defaultItems: { status: 0, amount: '0.0000', bonus_amount: '0.0000' },
}
)

View File

@@ -1,48 +1,231 @@
<template>
<el-dialog class="ba-operate-dialog" :close-on-click-modal="false" :model-value="['Add', 'Edit'].includes(baTable.form.operate!)" @close="baTable.toggleForm">
<template>
<el-dialog
class="ba-operate-dialog deposit-detail-dialog"
:close-on-click-modal="false"
:model-value="isOpen"
width="640px"
@close="onDialogClose"
>
<template #header>
<div class="title" v-drag="['.ba-operate-dialog', '.el-dialog__header']" v-zoom="'.ba-operate-dialog'">{{ baTable.form.operate ? t(baTable.form.operate) : '' }}</div>
<div class="title" v-drag="['.ba-operate-dialog', '.el-dialog__header']" v-zoom="'.ba-operate-dialog'">
{{ t('order.depositOrder.detail_title') }}
</div>
</template>
<el-scrollbar v-loading="baTable.form.loading" class="ba-table-form-scrollbar">
<div class="ba-operate-form" :class="'ba-' + baTable.form.operate + '-form'" :style="config.layout.shrink ? '' : 'width: calc(100% - ' + baTable.form.labelWidth! / 2 + 'px)'">
<el-form v-if="!baTable.form.loading" ref="formRef" @submit.prevent="" @keyup.enter="baTable.onSubmit(formRef)" :model="baTable.form.items" :label-position="config.layout.shrink ? 'top' : 'right'" :label-width="baTable.form.labelWidth + 'px'" :rules="rules">
<FormItem :label="t('order.depositOrder.order_no')" type="string" v-model="baTable.form.items!.order_no" prop="order_no" />
<FormItem :label="t('order.depositOrder.user_id')" type="number" v-model="baTable.form.items!.user_id" prop="user_id" :input-attr="{ min: 1, step: 1 }" />
<FormItem :label="t('order.depositOrder.channel_id')" type="number" v-model="baTable.form.items!.channel_id" prop="channel_id" :input-attr="{ min: 1, step: 1 }" />
<FormItem :label="t('order.depositOrder.amount')" type="number" v-model="baTable.form.items!.amount" prop="amount" :input-attr="{ step: 0.0001, precision: 4, min: 0 }" />
<FormItem :label="t('order.depositOrder.status')" type="radio" v-model="baTable.form.items!.status" prop="status" :input-attr="{ content: { '0': t('order.depositOrder.status 0'), '1': t('order.depositOrder.status 1'), '2': t('order.depositOrder.status 2'), '3': t('order.depositOrder.status 3') } }" />
<FormItem :label="t('order.depositOrder.pay_channel')" type="string" v-model="baTable.form.items!.pay_channel" prop="pay_channel" />
<FormItem :label="t('order.depositOrder.pay_time')" type="datetime" v-model="baTable.form.items!.pay_time" prop="pay_time" />
<FormItem :label="t('order.depositOrder.remark')" type="textarea" v-model="baTable.form.items!.remark" prop="remark" :input-attr="{ rows: 2 }" />
<el-scrollbar v-loading="loading" class="ba-table-form-scrollbar">
<div
class="ba-operate-form ba-edit-form"
:style="config.layout.shrink ? '' : 'width: calc(100% - ' + (baTable.form.labelWidth ?? 120) / 2 + 'px)'"
>
<el-form
v-if="!loading"
:label-position="config.layout.shrink ? 'top' : 'right'"
:label-width="(baTable.form.labelWidth ?? 120) + 'px'"
@submit.prevent=""
>
<el-form-item :label="t('order.depositOrder.order_no')">
<el-input :model-value="form.order_no" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.idempotency_key')">
<el-input :model-value="form.idempotency_key || '-'" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.user_username')">
<el-input :model-value="form.user_text" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.channel_name')">
<el-input :model-value="form.channel_text" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.status')">
<el-tag :type="statusTagType" effect="dark" size="small">{{ statusLabel }}</el-tag>
</el-form-item>
<el-form-item :label="t('order.depositOrder.amount')">
<el-input :model-value="amountText" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.bonus_amount')">
<el-input :model-value="bonusText" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.total_credit')">
<el-input :model-value="totalCreditText" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.pay_channel')">
<el-input :model-value="form.pay_channel || '-'" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.pay_time')">
<el-input :model-value="form.pay_time_text" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.deposit_tier_id')">
<el-input :model-value="form.deposit_tier_id || '-'" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.remark')">
<el-input v-model="form.remark" type="textarea" :rows="2" readonly />
</el-form-item>
<el-form-item :label="t('order.depositOrder.create_time')">
<el-input :model-value="form.create_time_text" readonly />
</el-form-item>
</el-form>
</div>
</el-scrollbar>
<template #footer>
<div :style="'width: calc(100% - ' + baTable.form.labelWidth! / 1.8 + 'px)'">
<el-button @click="baTable.toggleForm()">{{ t('Cancel') }}</el-button>
<el-button v-blur :loading="baTable.form.submitLoading" @click="baTable.onSubmit(formRef)" type="primary">{{ baTable.form.operateIds && baTable.form.operateIds.length > 1 ? t('Save and edit next item') : t('Save') }}</el-button>
<div class="detail-footer">
<el-button type="primary" v-blur @click="onDialogClose">{{ t('order.depositOrder.close_btn') }}</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import type { FormItemRule } from 'element-plus'
import { inject, reactive, useTemplateRef } from 'vue'
import { computed, inject, reactive, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import FormItem from '/@/components/formItem/index.vue'
import { useConfig } from '/@/stores/config'
import type baTableClass from '/@/utils/baTable'
const config = useConfig()
const formRef = useTemplateRef('formRef')
const baTable = inject('baTable') as baTableClass
const { t } = useI18n()
const rules: Partial<Record<string, FormItemRule[]>> = reactive({
order_no: [{ required: true, message: t('Please input field', { field: t('order.depositOrder.order_no') }) }],
user_id: [{ required: true, message: t('Please input field', { field: t('order.depositOrder.user_id') }) }],
const loading = ref(false)
const form = reactive({
id: 0,
order_no: '',
idempotency_key: '',
user_text: '-',
channel_text: '-',
pay_channel: '',
pay_time_text: '-',
deposit_tier_id: '',
remark: '',
create_time_text: '-',
amount: 0,
bonus_amount: 0,
status: 0,
})
const isOpen = computed(() => ['Edit'].includes(baTable.form.operate ?? ''))
watch(
() => ({ visible: isOpen.value, loadingState: baTable.form.loading, items: baTable.form.items }),
({ visible, loadingState }) => {
if (!visible) return
loading.value = loadingState === true
if (loadingState) return
hydrate()
},
{ deep: true, immediate: true }
)
const hydrate = () => {
const row = baTable.form.items as Record<string, unknown> | undefined
if (!row || !row['id']) {
return
}
form.id = Number(row['id'] ?? 0)
form.order_no = String(row['order_no'] ?? '')
form.idempotency_key = String(row['idempotency_key'] ?? '')
form.pay_channel = String(row['pay_channel'] ?? '')
form.deposit_tier_id = String(row['deposit_tier_id'] ?? '')
form.remark = String(row['remark'] ?? '')
form.amount = parseNumber(row['amount'])
form.bonus_amount = parseNumber(row['bonus_amount'])
form.status = Number(row['status'] ?? 0)
form.create_time_text = formatTime(row['create_time'])
form.pay_time_text = formatTime(row['pay_time'])
form.user_text = resolveRelationText(row, 'user', row['user_id'])
form.channel_text = resolveRelationText(row, 'channel', row['channel_id'])
}
const statusLabel = computed(() => t('order.depositOrder.status ' + form.status))
const statusTagType = computed(() => {
switch (form.status) {
case 1:
return 'success'
case 2:
return 'danger'
case 3:
return 'warning'
default:
return 'info'
}
})
const amountText = computed(() => formatAmount(form.amount))
const bonusText = computed(() => formatAmount(form.bonus_amount))
const totalCreditText = computed(() => formatAmount(Number((form.amount + form.bonus_amount).toFixed(2))))
const onDialogClose = () => {
baTable.toggleForm()
}
function parseNumber(raw: unknown): number {
if (raw === null || raw === undefined || raw === '') return 0
const n = Number(raw)
if (!Number.isFinite(n)) return 0
return Number(n.toFixed(2))
}
function formatAmount(value: number): string {
if (!Number.isFinite(value)) return '0.00'
return value.toFixed(2)
}
function formatTime(raw: unknown): string {
if (raw === null || raw === undefined || raw === '' || raw === 0) return '-'
const sec = Number(raw)
if (!Number.isFinite(sec) || sec <= 0) return '-'
const d = new Date(sec * 1000)
const pad = (n: number) => (n < 10 ? '0' + n : String(n))
return (
d.getFullYear() +
'-' +
pad(d.getMonth() + 1) +
'-' +
pad(d.getDate()) +
' ' +
pad(d.getHours()) +
':' +
pad(d.getMinutes()) +
':' +
pad(d.getSeconds())
)
}
function resolveRelationText(row: Record<string, unknown>, relationKey: string, fallbackId: unknown): string {
const rel = row[relationKey]
if (rel && typeof rel === 'object') {
const r = rel as Record<string, unknown>
const name = r['username'] ?? r['name']
if (typeof name === 'string' && name !== '') {
const id = fallbackId === null || fallbackId === undefined || fallbackId === '' ? '' : ' (ID: ' + String(fallbackId) + ')'
return name + id
}
}
if (fallbackId === null || fallbackId === undefined || fallbackId === '') {
return '-'
}
return 'ID: ' + String(fallbackId)
}
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.deposit-detail-dialog {
:deep(.el-dialog__body) {
padding-top: 8px;
}
}
.detail-footer {
display: flex;
justify-content: flex-end;
gap: 8px;
}
@media (max-width: 640px) {
:deep(.deposit-detail-dialog) {
width: calc(100vw - 24px) !important;
max-width: 100vw;
}
}
</style>

View File

@@ -3,7 +3,7 @@
<el-alert class="ba-table-alert" v-if="baTable.table.remark" :title="baTable.table.remark" type="info" show-icon />
<TableHeader
:buttons="['refresh', 'add', 'edit', 'delete', 'comSearch', 'quickSearch', 'columnDisplay']"
:buttons="['refresh', 'comSearch', 'quickSearch', 'columnDisplay']"
:quick-search-placeholder="t('Quick search placeholder', { fields: t('order.withdrawOrder.quick Search Fields') })"
></TableHeader>
@@ -29,7 +29,7 @@ defineOptions({
const { t } = useI18n()
const tableRef = useTemplateRef('tableRef')
const optButtons: OptButton[] = defaultOptButtons(['edit', 'delete'])
const optButtons: OptButton[] = defaultOptButtons(['edit'])
const baTable = new baTableClass(
new baTableApi('/admin/order.WithdrawOrder/'),
@@ -38,10 +38,33 @@ const baTable = new baTableClass(
column: [
{ type: 'selection', align: 'center', operator: false },
{ label: t('order.withdrawOrder.id'), prop: 'id', align: 'center', width: 80, operator: 'RANGE', sortable: 'custom' },
{ label: t('order.withdrawOrder.order_no'), prop: 'order_no', align: 'center', minWidth: 170, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query') },
{ label: t('order.withdrawOrder.user_id'), prop: 'user_id', align: 'center', width: 90, operator: 'RANGE' },
{ label: t('order.withdrawOrder.user_username'), prop: 'user.username', align: 'center', minWidth: 110, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), render: 'tags' },
{ label: t('order.withdrawOrder.channel_name'), prop: 'channel.name', align: 'center', minWidth: 110, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), render: 'tags' },
{
label: t('order.withdrawOrder.order_no'),
prop: 'order_no',
align: 'center',
minWidth: 170,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
},
// { label: t('order.withdrawOrder.user_id'), prop: 'user_id', align: 'center', width: 90, operator: 'RANGE' },
{
label: t('order.withdrawOrder.user_username'),
prop: 'user.username',
align: 'center',
minWidth: 120,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
render: 'tags',
},
{
label: t('order.withdrawOrder.channel_name'),
prop: 'channel.name',
align: 'center',
minWidth: 110,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
render: 'tags',
},
{ label: t('order.withdrawOrder.amount'), prop: 'amount', align: 'center', minWidth: 110, operator: 'RANGE' },
{ label: t('order.withdrawOrder.fee'), prop: 'fee', align: 'center', minWidth: 110, operator: 'RANGE' },
{ label: t('order.withdrawOrder.actual_amount'), prop: 'actual_amount', align: 'center', minWidth: 110, operator: 'RANGE' },
@@ -59,13 +82,64 @@ const baTable = new baTableClass(
'2': 'success',
'3': 'danger',
},
replaceValue: { '0': t('order.withdrawOrder.status 0'), '1': t('order.withdrawOrder.status 1'), '2': t('order.withdrawOrder.status 2'), '3': t('order.withdrawOrder.status 3') },
replaceValue: {
'0': t('order.withdrawOrder.status 0'),
'1': t('order.withdrawOrder.status 1'),
'2': t('order.withdrawOrder.status 2'),
'3': t('order.withdrawOrder.status 3'),
},
},
{
label: t('order.withdrawOrder.review_admin_username'),
prop: 'reviewAdmin.username',
align: 'center',
minWidth: 100,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
render: 'tags',
},
{
label: t('order.withdrawOrder.review_time'),
prop: 'review_time',
align: 'center',
render: 'datetime',
operator: 'RANGE',
comSearchRender: 'datetime',
sortable: 'custom',
width: 170,
timeFormat: 'yyyy-mm-dd hh:MM:ss',
},
{
label: t('order.withdrawOrder.remark'),
prop: 'remark',
align: 'center',
minWidth: 150,
operator: 'LIKE',
operatorPlaceholder: t('Fuzzy query'),
showOverflowTooltip: true,
},
{
label: t('order.withdrawOrder.create_time'),
prop: 'create_time',
align: 'center',
render: 'datetime',
operator: 'RANGE',
comSearchRender: 'datetime',
sortable: 'custom',
width: 170,
timeFormat: 'yyyy-mm-dd hh:MM:ss',
},
{
label: t('order.withdrawOrder.update_time'),
prop: 'update_time',
align: 'center',
render: 'datetime',
operator: 'RANGE',
comSearchRender: 'datetime',
sortable: 'custom',
width: 170,
timeFormat: 'yyyy-mm-dd hh:MM:ss',
},
{ label: t('order.withdrawOrder.review_admin_username'), prop: 'reviewAdmin.username', align: 'center', minWidth: 100, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), render: 'tags' },
{ label: t('order.withdrawOrder.review_time'), prop: 'review_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', sortable: 'custom', width: 170, timeFormat: 'yyyy-mm-dd hh:MM:ss' },
{ label: t('order.withdrawOrder.remark'), prop: 'remark', align: 'center', minWidth: 150, operator: 'LIKE', operatorPlaceholder: t('Fuzzy query'), showOverflowTooltip: true },
{ label: t('order.withdrawOrder.create_time'), prop: 'create_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', sortable: 'custom', width: 170, timeFormat: 'yyyy-mm-dd hh:MM:ss' },
{ label: t('order.withdrawOrder.update_time'), prop: 'update_time', align: 'center', render: 'datetime', operator: 'RANGE', comSearchRender: 'datetime', sortable: 'custom', width: 170, timeFormat: 'yyyy-mm-dd hh:MM:ss' },
{ label: t('Operate'), align: 'center', width: 90, render: 'buttons', buttons: optButtons, operator: false, fixed: 'right' },
],
},

View File

@@ -1,50 +1,434 @@
<template>
<el-dialog class="ba-operate-dialog" :close-on-click-modal="false" :model-value="['Add', 'Edit'].includes(baTable.form.operate!)" @close="baTable.toggleForm">
<el-dialog
class="ba-operate-dialog withdraw-review-dialog"
:close-on-click-modal="false"
:model-value="isOpen"
width="640px"
@close="onDialogClose"
>
<template #header>
<div class="title" v-drag="['.ba-operate-dialog', '.el-dialog__header']" v-zoom="'.ba-operate-dialog'">{{ baTable.form.operate ? t(baTable.form.operate) : '' }}</div>
<div class="title" v-drag="['.ba-operate-dialog', '.el-dialog__header']" v-zoom="'.ba-operate-dialog'">
{{ step === 'reject' ? t('order.withdrawOrder.review_reject_title') : t('order.withdrawOrder.review_title') }}
</div>
</template>
<el-scrollbar v-loading="baTable.form.loading" class="ba-table-form-scrollbar">
<div class="ba-operate-form" :class="'ba-' + baTable.form.operate + '-form'" :style="config.layout.shrink ? '' : 'width: calc(100% - ' + baTable.form.labelWidth! / 2 + 'px)'">
<el-form v-if="!baTable.form.loading" ref="formRef" @submit.prevent="" @keyup.enter="baTable.onSubmit(formRef)" :model="baTable.form.items" :label-position="config.layout.shrink ? 'top' : 'right'" :label-width="baTable.form.labelWidth + 'px'" :rules="rules">
<FormItem :label="t('order.withdrawOrder.order_no')" type="string" v-model="baTable.form.items!.order_no" prop="order_no" />
<FormItem :label="t('order.withdrawOrder.user_id')" type="number" v-model="baTable.form.items!.user_id" prop="user_id" :input-attr="{ min: 1, step: 1 }" />
<FormItem :label="t('order.withdrawOrder.channel_id')" type="number" v-model="baTable.form.items!.channel_id" prop="channel_id" :input-attr="{ min: 1, step: 1 }" />
<FormItem :label="t('order.withdrawOrder.amount')" type="number" v-model="baTable.form.items!.amount" prop="amount" :input-attr="{ step: 0.0001, precision: 4, min: 0 }" />
<FormItem :label="t('order.withdrawOrder.fee')" type="number" v-model="baTable.form.items!.fee" prop="fee" :input-attr="{ step: 0.0001, precision: 4, min: 0 }" />
<FormItem :label="t('order.withdrawOrder.actual_amount')" type="number" v-model="baTable.form.items!.actual_amount" prop="actual_amount" :input-attr="{ step: 0.0001, precision: 4, min: 0 }" />
<FormItem :label="t('order.withdrawOrder.status')" type="radio" v-model="baTable.form.items!.status" prop="status" :input-attr="{ content: { '0': t('order.withdrawOrder.status 0'), '1': t('order.withdrawOrder.status 1'), '2': t('order.withdrawOrder.status 2'), '3': t('order.withdrawOrder.status 3') } }" />
<FormItem :label="t('order.withdrawOrder.review_admin_id')" type="number" v-model="baTable.form.items!.review_admin_id" prop="review_admin_id" :input-attr="{ min: 1, step: 1 }" />
<FormItem :label="t('order.withdrawOrder.review_time')" type="datetime" v-model="baTable.form.items!.review_time" prop="review_time" />
<FormItem :label="t('order.withdrawOrder.remark')" type="textarea" v-model="baTable.form.items!.remark" prop="remark" :input-attr="{ rows: 2 }" />
<el-scrollbar v-loading="loading" class="ba-table-form-scrollbar">
<div class="ba-operate-form ba-edit-form" :style="config.layout.shrink ? '' : 'width: calc(100% - ' + (baTable.form.labelWidth ?? 120) / 2 + 'px)'">
<!-- 第一页关联信息 + 申请金额 / 手续费 -->
<el-form
v-if="!loading && step === 'review'"
ref="reviewFormRef"
:model="form"
:rules="reviewRules"
:label-position="config.layout.shrink ? 'top' : 'right'"
:label-width="(baTable.form.labelWidth ?? 120) + 'px'"
@submit.prevent=""
>
<el-form-item :label="t('order.withdrawOrder.order_no')">
<el-input v-model="form.order_no" readonly />
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.user_username')">
<el-input :model-value="form.user_text" readonly />
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.channel_name')">
<el-input :model-value="form.channel_text" readonly />
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.status')">
<el-tag :type="statusTagType" effect="dark" size="small">{{ statusLabel }}</el-tag>
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.create_time')">
<el-input :model-value="form.create_time_text" readonly />
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.amount')" prop="amount">
<el-input-number
v-model="form.amount"
:min="0"
:precision="2"
:step="1"
:controls="false"
:disabled="!isPending"
style="width: 100%"
/>
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.fee')" prop="fee">
<el-input-number
v-model="form.fee"
:min="0"
:precision="2"
:step="0.1"
:controls="false"
:disabled="!isPending"
style="width: 100%"
/>
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.actual_amount')">
<el-input :model-value="actualAmountText" readonly />
</el-form-item>
<el-form-item v-if="!isPending" :label="t('order.withdrawOrder.review_admin_username')">
<el-input :model-value="form.review_admin_text" readonly />
</el-form-item>
<el-form-item v-if="!isPending" :label="t('order.withdrawOrder.review_time')">
<el-input :model-value="form.review_time_text" readonly />
</el-form-item>
<el-form-item v-if="!isPending" :label="t('order.withdrawOrder.remark')">
<el-input v-model="form.remark" type="textarea" :rows="2" readonly />
</el-form-item>
</el-form>
<!-- 第二页拒绝 -> 必填备注 -->
<el-form
v-if="!loading && step === 'reject'"
ref="rejectFormRef"
:model="rejectForm"
:rules="rejectRules"
:label-position="config.layout.shrink ? 'top' : 'right'"
:label-width="(baTable.form.labelWidth ?? 120) + 'px'"
@submit.prevent=""
>
<el-alert
class="review-reject-hint"
type="warning"
show-icon
:closable="false"
:title="t('order.withdrawOrder.review_reject_tip')"
/>
<el-form-item :label="t('order.withdrawOrder.order_no')">
<el-input v-model="form.order_no" readonly />
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.amount')">
<el-input :model-value="amountText" readonly />
</el-form-item>
<el-form-item :label="t('order.withdrawOrder.remark')" prop="remark">
<el-input
v-model="rejectForm.remark"
type="textarea"
:rows="4"
maxlength="255"
show-word-limit
:placeholder="t('order.withdrawOrder.review_reject_placeholder')"
/>
</el-form-item>
</el-form>
</div>
</el-scrollbar>
<template #footer>
<div :style="'width: calc(100% - ' + baTable.form.labelWidth! / 1.8 + 'px)'">
<el-button @click="baTable.toggleForm()">{{ t('Cancel') }}</el-button>
<el-button v-blur :loading="baTable.form.submitLoading" @click="baTable.onSubmit(formRef)" type="primary">{{ baTable.form.operateIds && baTable.form.operateIds.length > 1 ? t('Save and edit next item') : t('Save') }}</el-button>
<div class="review-footer">
<template v-if="step === 'review'">
<el-button @click="onDialogClose">{{ t('Cancel') }}</el-button>
<template v-if="isPending">
<el-button type="danger" :loading="submitting" @click="gotoReject">{{ t('order.withdrawOrder.review_btn_reject') }}</el-button>
<el-button type="primary" v-blur :loading="submitting" @click="submitApprove">{{ t('order.withdrawOrder.review_btn_approve') }}</el-button>
</template>
</template>
<template v-else>
<el-button @click="backToReview">{{ t('order.withdrawOrder.review_btn_back') }}</el-button>
<el-button type="danger" v-blur :loading="submitting" @click="submitReject">{{ t('order.withdrawOrder.review_btn_confirm_reject') }}</el-button>
</template>
</div>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import type { FormItemRule } from 'element-plus'
import { inject, reactive, useTemplateRef } from 'vue'
import type { FormInstance, FormItemRule } from 'element-plus'
import { ElMessage } from 'element-plus'
import { computed, inject, reactive, ref, useTemplateRef, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import FormItem from '/@/components/formItem/index.vue'
import createAxios from '/@/utils/axios'
import { useConfig } from '/@/stores/config'
import type baTableClass from '/@/utils/baTable'
const config = useConfig()
const formRef = useTemplateRef('formRef')
const baTable = inject('baTable') as baTableClass
const { t } = useI18n()
const rules: Partial<Record<string, FormItemRule[]>> = reactive({
order_no: [{ required: true, message: t('Please input field', { field: t('order.withdrawOrder.order_no') }) }],
user_id: [{ required: true, message: t('Please input field', { field: t('order.withdrawOrder.user_id') }) }],
const reviewFormRef = useTemplateRef<FormInstance>('reviewFormRef')
const rejectFormRef = useTemplateRef<FormInstance>('rejectFormRef')
type Step = 'review' | 'reject'
const step = ref<Step>('review')
const loading = ref(false)
const submitting = ref(false)
const form = reactive({
id: 0,
order_no: '',
user_text: '-',
channel_text: '-',
create_time_text: '',
review_admin_text: '-',
review_time_text: '-',
amount: 0,
fee: 0,
status: 0,
remark: '',
})
const rejectForm = reactive({
remark: '',
})
const isOpen = computed(() => ['Edit'].includes(baTable.form.operate ?? ''))
const isPending = computed(() => form.status === 0)
watch(
isOpen,
(visible) => {
if (!visible) {
return
}
step.value = 'review'
rejectForm.remark = ''
}
)
watch(
() => ({ visible: isOpen.value, loadingState: baTable.form.loading, items: baTable.form.items }),
({ visible, loadingState }) => {
if (!visible) return
loading.value = loadingState === true
if (loadingState) return
hydrate()
},
{ deep: true, immediate: true }
)
const hydrate = () => {
const row = baTable.form.items as Record<string, unknown> | undefined
if (!row || !row['id']) {
return
}
form.id = Number(row['id'] ?? 0)
form.order_no = String(row['order_no'] ?? '')
form.amount = parseNumber(row['amount'])
form.fee = parseNumber(row['fee'])
form.status = Number(row['status'] ?? 0)
form.remark = String(row['remark'] ?? '')
form.create_time_text = formatTime(row['create_time'])
form.review_time_text = formatTime(row['review_time'])
form.user_text = resolveRelationText(row, 'user', row['user_id'])
form.channel_text = resolveRelationText(row, 'channel', row['channel_id'])
form.review_admin_text = resolveRelationText(row, 'reviewAdmin', row['review_admin_id'])
}
const statusLabel = computed(() => t('order.withdrawOrder.status ' + form.status))
const statusTagType = computed(() => {
switch (form.status) {
case 1:
return 'success'
case 2:
return 'danger'
case 3:
return 'success'
default:
return 'warning'
}
})
const amountText = computed(() => formatAmount(form.amount))
const actualAmountText = computed(() => {
const actual = Number((form.amount - form.fee).toFixed(2))
return formatAmount(actual < 0 ? 0 : actual)
})
const reviewRules: Record<string, FormItemRule[]> = {
amount: [
{
required: true,
validator: (_r, value, cb) => {
if (value === null || value === undefined || Number(value) <= 0) {
cb(new Error(t('order.withdrawOrder.amount_invalid')))
return
}
cb()
},
},
],
fee: [
{
required: true,
validator: (_r, value, cb) => {
if (value === null || value === undefined || Number(value) < 0) {
cb(new Error(t('order.withdrawOrder.fee_invalid')))
return
}
if (Number(value) > Number(form.amount)) {
cb(new Error(t('order.withdrawOrder.fee_exceed_amount')))
return
}
cb()
},
},
],
}
const rejectRules: Record<string, FormItemRule[]> = {
remark: [
{
required: true,
validator: (_r, value, cb) => {
const text = typeof value === 'string' ? value.trim() : ''
if (text === '') {
cb(new Error(t('order.withdrawOrder.reject_reason_required')))
return
}
cb()
},
trigger: 'blur',
},
],
}
const onDialogClose = () => {
if (submitting.value) {
return
}
step.value = 'review'
baTable.toggleForm()
}
const gotoReject = async () => {
step.value = 'reject'
rejectForm.remark = ''
}
const backToReview = () => {
step.value = 'review'
}
const submitApprove = async () => {
if (!isPending.value) {
ElMessage.warning(t('order.withdrawOrder.already_reviewed'))
return
}
const formEl = reviewFormRef.value
if (!formEl) return
const valid = await formEl.validate().catch(() => false)
if (!valid) return
submitting.value = true
try {
await createAxios(
{
url: '/admin/order.WithdrawOrder/approve',
method: 'POST',
data: {
id: form.id,
amount: form.amount.toFixed(4),
fee: form.fee.toFixed(4),
},
},
{ showSuccessMessage: true }
)
baTable.onTableHeaderAction('refresh', {})
baTable.toggleForm()
} catch (_e) {
// errors already surfaced by axios interceptor
} finally {
submitting.value = false
}
}
const submitReject = async () => {
const formEl = rejectFormRef.value
if (!formEl) return
const valid = await formEl.validate().catch(() => false)
if (!valid) return
submitting.value = true
try {
await createAxios(
{
url: '/admin/order.WithdrawOrder/reject',
method: 'POST',
data: {
id: form.id,
remark: rejectForm.remark.trim(),
},
},
{ showSuccessMessage: true }
)
baTable.onTableHeaderAction('refresh', {})
baTable.toggleForm()
} catch (_e) {
// errors already surfaced by axios interceptor
} finally {
submitting.value = false
}
}
function parseNumber(raw: unknown): number {
if (raw === null || raw === undefined || raw === '') return 0
const n = Number(raw)
if (!Number.isFinite(n)) return 0
return Number(n.toFixed(2))
}
function formatAmount(value: number): string {
if (!Number.isFinite(value)) return '0.00'
return value.toFixed(2)
}
function formatTime(raw: unknown): string {
if (raw === null || raw === undefined || raw === '' || raw === 0) return '-'
const sec = Number(raw)
if (!Number.isFinite(sec) || sec <= 0) return '-'
const d = new Date(sec * 1000)
const pad = (n: number) => (n < 10 ? '0' + n : String(n))
return (
d.getFullYear() +
'-' +
pad(d.getMonth() + 1) +
'-' +
pad(d.getDate()) +
' ' +
pad(d.getHours()) +
':' +
pad(d.getMinutes()) +
':' +
pad(d.getSeconds())
)
}
function resolveRelationText(row: Record<string, unknown>, relationKey: string, fallbackId: unknown): string {
const rel = row[relationKey]
if (rel && typeof rel === 'object') {
const r = rel as Record<string, unknown>
const name = r['username'] ?? r['name']
if (typeof name === 'string' && name !== '') {
const id = fallbackId === null || fallbackId === undefined || fallbackId === '' ? '' : ' (ID: ' + String(fallbackId) + ')'
return name + id
}
}
if (fallbackId === null || fallbackId === undefined || fallbackId === '') {
return '-'
}
return 'ID: ' + String(fallbackId)
}
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.withdraw-review-dialog {
:deep(.el-dialog__body) {
padding-top: 8px;
}
.review-reject-hint {
margin-bottom: 14px;
}
}
.review-footer {
display: flex;
justify-content: flex-end;
gap: 8px;
}
@media (max-width: 640px) {
:deep(.withdraw-review-dialog) {
width: calc(100vw - 24px) !important;
max-width: 100vw;
}
}
</style>

View File

@@ -1,4 +1,4 @@
<template>
<template>
<div class="default-main ba-table-box">
<el-alert class="ba-table-alert" v-if="baTable.table.remark" :title="baTable.table.remark" type="info" show-icon />
@@ -245,8 +245,17 @@ const baTable = new baTableClass(
formatter: formatCoin,
},
{
label: t('user.user.total_valid_bet_coin'),
prop: 'total_valid_bet_coin',
label: t('user.user.total_withdraw_coin'),
prop: 'total_withdraw_coin',
align: 'center',
minWidth: 110,
sortable: false,
operator: 'RANGE',
formatter: formatCoin,
},
{
label: t('user.user.bet_flow_coin'),
prop: 'bet_flow_coin',
align: 'center',
minWidth: 110,
sortable: false,
@@ -352,7 +361,8 @@ const baTable = new baTableClass(
status: '1',
coin: '0.00',
total_deposit_coin: '0.00',
total_valid_bet_coin: '0.00',
total_withdraw_coin: '0.00',
bet_flow_coin: '0.00',
risk_flags: 0,
current_streak: 0,
last_bet_period_no: '',