og/Socket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复作废操作操作错误的局

Browse Source
This commit is contained in:
黎小北
2026-03-25 06:30:12 +08:00
parent a9108d7581
commit 0d420e3a78
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/process/ResetNumberTabService.php
+10 -5
View File
@@ -22,14 +22,15 @@ class ResetNumberTabService
*/ */
public static function resetNumberTabService(array $tableInfo){ public static function resetNumberTabService(array $tableInfo){
$ws = app('\think\swoole\WebSocket'); $ws = app('\think\swoole\WebSocket');
$numberTabInfo = NumberTab::getByTableIdOrderByIdDesc($tableInfo); // 使用 InitTableService::initTable 获取当前靴的最新一局，与 onlineLogin 保持一致
$numberTabInfo = InitTableService::initTable($tableInfo);
if (!$numberTabInfo){ if (!$numberTabInfo){
$ws->emit('resetNumberTab', ['status' => false, 'msg' => 'not_number_tab_data']); $ws->emit('resetNumberTab', ['status' => false, 'msg' => 'not_number_tab_data']);
return; return;
} }
// 调试日志 // 调试日志
\think\facade\Log::write('resetNumberTab debug: bet_status=' . $numberTabInfo['bet_status'] . ', rob_status=' . $numberTabInfo['rob_status'] . ', id=' . $numberTabInfo['id'], 'info'); \think\facade\Log::write('resetNumberTab debug: bet_status=' . $numberTabInfo['bet_status'] . ', rob_status=' . $numberTabInfo['rob_status'] . ', id=' . $numberTabInfo['id'] . ', boot_id=' . $numberTabInfo['boot_id'], 'info');
if($numberTabInfo['bet_status'] == 1 || $numberTabInfo['bet_status'] == 2 || ($numberTabInfo['bet_status'] == 0 || $numberTabInfo['rob_status'] == 1) || ($numberTabInfo['bet_status'] == 0 || $numberTabInfo['rob_status'] == 2)){ if($numberTabInfo['bet_status'] == 1 || $numberTabInfo['bet_status'] == 2 || ($numberTabInfo['bet_status'] == 0 && $numberTabInfo['rob_status'] == 1) || ($numberTabInfo['bet_status'] == 0 && $numberTabInfo['rob_status'] == 2)){
//事务处理 //事务处理
$res = NumberTab::resetNumberTab($numberTabInfo); $res = NumberTab::resetNumberTab($numberTabInfo);
\think\facade\Log::write('resetNumberTab result: ' . ($res ? 'true' : 'false'), 'info'); \think\facade\Log::write('resetNumberTab result: ' . ($res ? 'true' : 'false'), 'info');
@@ -38,7 +39,7 @@ class ResetNumberTabService
return; return;
} }
$numberTabInfo['bet_status'] = 0; $numberTabInfo['bet_status'] = 0;
$ws->to(SocketSession::HOUSE_NAME)->emit('resetNumberTab',[ $responseData = [
'status' => true, 'status' => true,
'table_id' => $tableInfo['id'], 'table_id' => $tableInfo['id'],
'round' => [ 'round' => [
@@ -49,7 +50,11 @@ class ResetNumberTabService
'in_checkout' => $tableInfo['in_checkout'], 'in_checkout' => $tableInfo['in_checkout'],
'number_tab_status' => InitTableService::numberTabStatus($numberTabInfo) 'number_tab_status' => InitTableService::numberTabStatus($numberTabInfo)
] ]
]); ];
// 广播到 house 房间
$ws->to(SocketSession::HOUSE_NAME)->emit('resetNumberTab', $responseData);
// 同时发送给请求者
$ws->emit('resetNumberTab', $responseData);
}else{ }else{
$ws->emit('resetNumberTab', ['status' => false, 'msg' => 'reset_number_fail']); $ws->emit('resetNumberTab', ['status' => false, 'msg' => 'reset_number_fail']);
} }
app/services/process/StartBetService.php
+6 -2
View File
@@ -26,7 +26,7 @@ class StartBetService
$modelRes = NumberTab::startBet($numberTabId); $modelRes = NumberTab::startBet($numberTabId);
if ($modelRes['status'] == true){ if ($modelRes['status'] == true){
$numberTabInfo = $modelRes['data']; $numberTabInfo = $modelRes['data'];
$ws->to(SocketSession::HOUSE_NAME)->emit('startBet',[ $responseData = [
'status' => true, 'status' => true,
'table_id' => $tableInfo['id'], 'table_id' => $tableInfo['id'],
'round' => [ 'round' => [
@@ -37,7 +37,11 @@ class StartBetService
'in_checkout' => $tableInfo['in_checkout'], 'in_checkout' => $tableInfo['in_checkout'],
'number_tab_status' => InitTableService::numberTabStatus($numberTabInfo) 'number_tab_status' => InitTableService::numberTabStatus($numberTabInfo)
] ]
]); ];
// 广播到 house 房间
$ws->to(SocketSession::HOUSE_NAME)->emit('startBet', $responseData);
// 同时发送给请求者
$ws->emit('startBet', $responseData);
//启动倒计时(该处以后会废弃掉) //启动倒计时(该处以后会废弃掉)
CountdownService::countdown($numberTabId,$tableInfo,$modelRes['data']); CountdownService::countdown($numberTabId,$tableInfo,$modelRes['data']);
}else{ }else{