1.压注记录修改为游玩记录

2.测试结算并测试
3.备份数据库
This commit is contained in:
2026-04-23 17:21:02 +08:00
parent 1531115a26
commit f2b4dab54f
20 changed files with 2130 additions and 94 deletions

View File

@@ -599,6 +599,9 @@ class Channel extends Backend
if ($response !== null) {
return $response;
}
if (!$this->auth->isSuperAdmin()) {
return $this->error('仅超管可执行结算,结算后系统会自动发放至管理员钱包');
}
$id = (int) ($request->post('id', $request->get('id', 0)));
if ($id <= 0) {
@@ -614,18 +617,11 @@ class Channel extends Backend
$remark = trim((string) $request->post('remark', ''));
if ($this->auth->isSuperAdmin()) {
$res = ChannelSettlementService::settleBySuperAdmin((int) $row['id'], intval($this->auth->id), $remark, false);
if (($res['ok'] ?? false) !== true) {
return $this->error((string) ($res['msg'] ?? '结算失败'));
}
return $this->success('超管结算完成,渠道分红余额已入账');
}
$res = ChannelSettlementService::settleDividendByChannelAdmin((int) $row['id'], intval($this->auth->id), $remark);
$res = ChannelSettlementService::settleBySuperAdmin((int) $row['id'], intval($this->auth->id), $remark, false);
if (($res['ok'] ?? false) !== true) {
return $this->error((string) ($res['msg'] ?? '结算失败'));
}
return $this->success('渠道分红已结算完成');
return $this->success('超管结算完成,已按分配比例自动发放给管理员');
}
/**

View File

@@ -0,0 +1,77 @@
<?php
namespace app\admin\controller\admin;
use app\common\controller\Backend;
use support\Response;
use Webman\Http\Request as WebmanRequest;
/**
* 管理员钱包(只读)
*/
class AdminWallet extends Backend
{
protected ?object $model = null;
protected bool $modelValidate = false;
protected string|array $quickSearchField = ['id', 'admin_id'];
protected string|array $defaultSortField = ['id' => 'desc'];
protected string|array $orderGuarantee = ['id' => 'desc'];
protected array $withJoinTable = ['admin'];
protected function initController(WebmanRequest $request): ?Response
{
$this->model = new \app\common\model\AdminWallet();
return null;
}
protected function _index(): Response
{
if ($this->request && $this->request->get('select')) {
return $this->select($this->request);
}
list($where, $alias, $limit, $order) = $this->queryBuilder();
$table = strtolower($this->model->getTable());
$mainShort = $alias[$table] ?? '';
if ($mainShort !== '' && $this->auth && !$this->auth->isSuperAdmin()) {
// 非超管仅可查看自己钱包
$where[] = [$mainShort . '.admin_id', '=', intval($this->auth->id ?? 0)];
}
$res = $this->model
->withJoin($this->withJoinTable, $this->withJoinType)
->with($this->withJoinTable)
->visible([
'admin' => ['username', 'channel_id'],
])
->alias($alias)
->where($where)
->order($order)
->paginate($limit);
return $this->success('', [
'list' => $res->items(),
'total' => $res->total(),
'remark' => get_route_remark(),
]);
}
protected function _add(): Response
{
return $this->error('管理员钱包不允许手动新增');
}
protected function _edit(): Response
{
return $this->error('管理员钱包不允许手动编辑');
}
protected function _del(): Response
{
return $this->error('管理员钱包不允许删除');
}
}

View File

@@ -0,0 +1,79 @@
<?php
namespace app\admin\controller\admin;
use app\common\controller\Backend;
use support\Response;
use Webman\Http\Request as WebmanRequest;
/**
* 管理员钱包流水(只读)
*/
class AdminWalletRecord extends Backend
{
protected ?object $model = null;
protected bool $modelValidate = false;
protected string|array $quickSearchField = ['id', 'biz_type', 'ref_type', 'idempotency_key', 'remark'];
protected string|array $defaultSortField = ['id' => 'desc'];
protected string|array $orderGuarantee = ['id' => 'desc'];
protected array $withJoinTable = ['admin', 'channel', 'operatorAdmin'];
protected function initController(WebmanRequest $request): ?Response
{
$this->model = new \app\common\model\AdminWalletRecord();
return null;
}
protected function _index(): Response
{
if ($this->request && $this->request->get('select')) {
return $this->select($this->request);
}
list($where, $alias, $limit, $order) = $this->queryBuilder();
$table = strtolower($this->model->getTable());
$mainShort = $alias[$table] ?? '';
if ($mainShort !== '' && $this->auth && !$this->auth->isSuperAdmin()) {
$where[] = [$mainShort . '.admin_id', '=', intval($this->auth->id ?? 0)];
}
$res = $this->model
->withJoin($this->withJoinTable, $this->withJoinType)
->with($this->withJoinTable)
->visible([
'admin' => ['username'],
'channel' => ['name'],
'operatorAdmin' => ['username'],
])
->alias($alias)
->where($where)
->order($order)
->paginate($limit);
return $this->success('', [
'list' => $res->items(),
'total' => $res->total(),
'remark' => get_route_remark(),
]);
}
protected function _add(): Response
{
return $this->error('管理员钱包流水不允许手动新增');
}
protected function _edit(): Response
{
return $this->error('管理员钱包流水不允许手动编辑');
}
protected function _del(): Response
{
return $this->error('管理员钱包流水不允许删除');
}
}

View File

@@ -0,0 +1,120 @@
<?php
namespace app\admin\controller\game;
use app\common\controller\Backend;
use support\Response;
use Webman\Http\Request as WebmanRequest;
/**
* 游玩记录(原压注订单)
*/
class PlayRecord extends Backend
{
protected ?object $model = null;
protected bool $modelValidate = false;
protected string|array $quickSearchField = ['id', 'period_no', 'idempotency_key'];
protected string|array $defaultSortField = ['id' => 'desc'];
protected string|array $orderGuarantee = ['id' => 'desc'];
protected array $withJoinTable = ['user', 'channel', 'gameRecord'];
protected function initController(WebmanRequest $request): ?Response
{
$this->model = new \app\common\model\PlayRecord();
return null;
}
public function add(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
return $this->error('游玩记录由游戏接口生成,禁止后台手工新增');
}
public function edit(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
return $this->error('游玩记录不可编辑');
}
public function del(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
return $this->error('游玩记录不可删除');
}
public function sortable(WebmanRequest $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
return $this->error('不支持排序');
}
protected function _index(): Response
{
if ($this->request && $this->request->get('select')) {
return $this->select($this->request);
}
list($where, $alias, $limit, $order) = $this->queryBuilder();
$table = strtolower($this->model->getTable());
$mainShort = $alias[$table] ?? '';
if ($mainShort !== '' && $this->auth && !$this->auth->isSuperAdmin()) {
$where[] = ['user.admin_id', 'in', $this->scopedAdminIds()];
}
$res = $this->model
->withJoin($this->withJoinTable, $this->withJoinType)
->with($this->withJoinTable)
->visible([
'user' => ['username', 'phone'],
'channel' => ['name'],
'gameRecord' => ['period_no', 'status'],
])
->alias($alias)
->where($where)
->order($order)
->paginate($limit);
return $this->success('', [
'list' => $res->items(),
'total' => $res->total(),
'remark' => get_route_remark(),
]);
}
/**
* @return int[]
*/
private function scopedAdminIds(): array
{
if (!$this->auth) {
return [0];
}
if ($this->auth->isSuperAdmin()) {
return [];
}
$groupIds = $this->auth->getAdminChildGroups();
$adminIds = $groupIds ? $this->auth->getGroupAdmins($groupIds) : [];
$adminIds[] = $this->auth->id;
$adminIds = array_map(static fn($id) => intval(strval($id)), $adminIds);
$adminIds = array_values(array_unique(array_filter($adminIds, static fn($id) => $id > 0)));
return $adminIds === [] ? [0] : $adminIds;
}
}

View File

@@ -0,0 +1,51 @@
<?php
namespace app\common\model;
use app\common\service\GameLiveService;
use support\think\Model;
use Throwable;
class PlayRecord extends Model
{
protected $name = 'game_play_record';
protected $autoWriteTimestamp = true;
protected $type = [
'create_time' => 'integer',
'update_time' => 'integer',
'pick_numbers' => 'json',
'total_amount' => 'string',
'win_amount' => 'string',
'jackpot_extra_amount' => 'string',
'status' => 'integer',
'streak_at_bet' => 'integer',
'is_auto' => 'integer',
];
public function user(): \think\model\relation\BelongsTo
{
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function channel(): \think\model\relation\BelongsTo
{
return $this->belongsTo(Channel::class, 'channel_id', 'id');
}
protected static function onAfterInsert($model): void
{
try {
$periodId = isset($model['period_id']) ? intval($model['period_id']) : null;
GameLiveService::publishSnapshot($periodId);
} catch (Throwable) {
}
}
public function gameRecord(): \think\model\relation\BelongsTo
{
return $this->belongsTo(GameRecord::class, 'period_id', 'id');
}
}

View File

@@ -27,7 +27,15 @@ class AdminWalletService
return Db::name('admin_wallet')->where('admin_id', $adminId)->find() ?: [];
}
public static function creditCommission(int $adminId, ?int $channelId, string $amount, string $refType, int $refId, string $remark): void
public static function creditCommission(
int $adminId,
?int $channelId,
string $amount,
string $refType,
int $refId,
string $remark,
?int $operatorAdminId = null
): void
{
$wallet = self::ensureWallet($adminId);
$before = strval($wallet['balance'] ?? '0.00');
@@ -49,7 +57,7 @@ class AdminWalletService
'ref_type' => $refType,
'ref_id' => $refId,
'idempotency_key' => 'commission_income_' . $adminId . '_' . $refId,
'operator_admin_id' => null,
'operator_admin_id' => $operatorAdminId,
'remark' => $remark,
'create_time' => $now,
]);

View File

@@ -37,7 +37,7 @@ class ChannelSettlementService
'total_bet_amount' => $payload['total_bet_amount'],
'total_payout_amount' => $payload['total_payout_amount'],
'platform_profit_amount' => $payload['platform_profit_amount'],
'status' => 1,
'status' => 2,
'remark' => $remark !== '' ? $remark : (($auto ? '自动' : '手动') . '渠道结算-CH' . $channelId),
'create_time' => $now,
'update_time' => $now,
@@ -54,9 +54,32 @@ class ChannelSettlementService
if ($rows === []) {
throw new \RuntimeException('生成待分红记录失败');
}
Db::name('agent_commission_record')->insertAll($rows);
foreach ($rows as $row) {
$adminId = intval($row['admin_id'] ?? 0);
$amount = strval($row['commission_amount'] ?? '0.00');
if ($adminId <= 0) {
continue;
}
$row['status'] = 1;
$row['settled_at'] = $now;
$row['remark'] = strval($row['remark'] ?? '') . ' | 超管结算直接发放';
$row['update_time'] = $now;
$commissionRecordId = intval(Db::name('agent_commission_record')->insertGetId($row));
if (bccomp($amount, '0.00', 2) > 0) {
AdminWalletService::creditCommission(
$adminId,
$channelId,
$amount,
'agent_commission_record',
$commissionRecordId,
$remark !== '' ? $remark : '超管结算自动发放分红',
$operatorAdminId
);
}
}
// 已改为超管结算即发放,结算后不再保留渠道待分红余额。
Db::name('channel')->where('id', $channelId)->update([
'carryover_balance' => Db::raw('carryover_balance + ' . strval($payload['commission_amount'])),
'carryover_balance' => '0.00',
'update_time' => $now,
]);
Db::commit();
@@ -69,83 +92,7 @@ class ChannelSettlementService
public static function settleDividendByChannelAdmin(int $channelId, int $operatorAdminId, string $remark = ''): array
{
$channel = Db::name('channel')->where('id', $channelId)->find();
if (!is_array($channel)) {
return ['ok' => false, 'msg' => '渠道不存在'];
}
$carryover = strval($channel['carryover_balance'] ?? '0.00');
if (bccomp($carryover, '0', 2) <= 0) {
return ['ok' => false, 'msg' => '当前渠道没有分红余额,待下周期结算'];
}
$pendingRows = Db::name('agent_commission_record')
->where('channel_id', $channelId)
->where('status', 0)
->order('id', 'asc')
->select()
->toArray();
if ($pendingRows === []) {
return ['ok' => false, 'msg' => '当前渠道没有待分红记录,待下周期结算'];
}
$totalPending = '0.00';
foreach ($pendingRows as $pendingRow) {
$totalPending = bcadd($totalPending, strval($pendingRow['commission_amount'] ?? '0.00'), 2);
}
if (bccomp($carryover, $totalPending, 2) < 0) {
return ['ok' => false, 'msg' => '渠道可分红余额不足,请联系超管核对结算'];
}
$now = time();
Db::startTrans();
try {
foreach ($pendingRows as $pendingRow) {
$amount = strval($pendingRow['commission_amount'] ?? '0.00');
$adminId = intval($pendingRow['admin_id'] ?? 0);
if ($adminId <= 0 || bccomp($amount, '0', 2) <= 0) {
continue;
}
AdminWalletService::creditCommission(
$adminId,
$channelId,
$amount,
'agent_commission_record',
intval($pendingRow['id'] ?? 0),
$remark !== '' ? $remark : '渠道分红结算入账'
);
}
Db::name('agent_commission_record')
->where('channel_id', $channelId)
->where('status', 0)
->update([
'status' => 1,
'settled_at' => $now,
'update_time' => $now,
'remark' => Db::raw("CONCAT(remark, ' | 渠道结算确认')"),
]);
Db::name('channel')->where('id', $channelId)->update([
'carryover_balance' => bcsub($carryover, $totalPending, 2),
'update_time' => $now,
]);
$periodIds = Db::name('agent_commission_record')->where('channel_id', $channelId)->where('status', 1)->column('settlement_period_id');
if ($periodIds !== []) {
foreach ($periodIds as $periodIdRaw) {
$periodId = intval($periodIdRaw);
if ($periodId <= 0) {
continue;
}
$left = intval(Db::name('agent_commission_record')->where('settlement_period_id', $periodId)->where('status', 0)->count());
if ($left === 0) {
Db::name('agent_settlement_period')->where('id', $periodId)->update([
'status' => 2,
'update_time' => $now,
]);
}
}
}
Db::commit();
} catch (Throwable $e) {
Db::rollback();
return ['ok' => false, 'msg' => $e->getMessage()];
}
return ['ok' => true, 'settled_amount' => $totalPending];
return ['ok' => false, 'msg' => '当前流程为超管结算后自动发放,渠道管理员无需二次结算'];
}
public static function settleAllDueChannels(int $operatorAdminId): array