diff --git a/app/services/bet/ToBetCommonService.php b/app/services/bet/ToBetCommonService.php index 4390261..a5c11fe 100644 --- a/app/services/bet/ToBetCommonService.php +++ b/app/services/bet/ToBetCommonService.php @@ -8,6 +8,7 @@ use app\models\bet\Bet; use app\models\process\NumberTab; use app\models\user\User; use app\models\user\Session; +use app\services\connect\InitTableService; class ToBetCommonService { @@ -39,7 +40,8 @@ class ToBetCommonService return ['status' => false, 'msg' => 'to_bet_fail_10']; } } - $numberTabInfo = NumberTab::getByTableIdOrderByIdDesc($tableInfo); + // 使用 InitTableService::initTable 获取当前靴的最新一局,与其他服务保持一致 + $numberTabInfo = InitTableService::initTable($tableInfo); if ($numberTabInfo['id'] != $numberTabId){ return ['status' => false, 'msg' => 'to_bet_fail_5']; } diff --git a/app/services/connect/ScanConnectService.php b/app/services/connect/ScanConnectService.php index a5afe53..e3c3850 100644 --- a/app/services/connect/ScanConnectService.php +++ b/app/services/connect/ScanConnectService.php @@ -1,48 +1,49 @@ -get('table_id')); - $tableInfo = Table::get($tableId); - $numberTabInfo = NumberTab::getByTableIdOrderByIdDesc($tableInfo); - if (!$numberTabInfo){ - $ws->emit('onlineLogin',['status' => false, 'msg' => 'Not NumberTab Data']); - $ws->close(); - return; - } - $round = array(); - $round['tid'] = $tableId; - $round['boot_id'] = intval($numberTabInfo['boot_id']); - $round['boot_num'] = intval($numberTabInfo['boot_num']); - $round['number_tab_id'] = intval($numberTabInfo['id']); - $round['number_tab_number'] = intval($numberTabInfo['number']); - if ($numberTabInfo['bet_status'] == 2){ - $round['is_scan'] = true; - }else{ - $round['is_scan'] = false; - } - $ws->join(SocketSession::HOUSE_NAME); - $ws->emit('onlineLogin',['status' => true, 'table_id' => $tableInfo['id'], 'round' => $round]); - } -} +get('table_id')); + $tableInfo = Table::get($tableId); + // 使用 InitTableService::initTable 获取当前靴的最新一局,与其他服务保持一致 + $numberTabInfo = InitTableService::initTable($tableInfo); + if (!$numberTabInfo){ + $ws->emit('onlineLogin',['status' => false, 'msg' => 'Not NumberTab Data']); + $ws->close(); + return; + } + $round = array(); + $round['tid'] = $tableId; + $round['boot_id'] = intval($numberTabInfo['boot_id']); + $round['boot_num'] = intval($numberTabInfo['boot_num']); + $round['number_tab_id'] = intval($numberTabInfo['id']); + $round['number_tab_number'] = intval($numberTabInfo['number']); + if ($numberTabInfo['bet_status'] == 2){ + $round['is_scan'] = true; + }else{ + $round['is_scan'] = false; + } + $ws->join(SocketSession::HOUSE_NAME); + $ws->emit('onlineLogin',['status' => true, 'table_id' => $tableInfo['id'], 'round' => $round]); + } +}