fix: resetNumberTab 支持 bet_status=3 + 路单变量名修正
- ResetNumberTabService: 条件增加 bet_status==3,修复 || 应为 && 的逻辑错误 - WaybillRemindService: last_banker_lenth → last_player_lenth(result==2 是闲家) - 所有荷官操作端 handle_*.js: resetNumberTab 同步支持 betStatus==3
This commit is contained in:
@@ -30,7 +30,7 @@ class ResetNumberTabService
|
||||
}
|
||||
// 调试日志
|
||||
\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'] == 3 || ($numberTabInfo['bet_status'] == 0 && ($numberTabInfo['rob_status'] == 1 || $numberTabInfo['rob_status'] == 2))){
|
||||
//事务处理
|
||||
$res = NumberTab::resetNumberTab($numberTabInfo);
|
||||
\think\facade\Log::write('resetNumberTab result: ' . ($res ? 'true' : 'false'), 'info');
|
||||
|
||||
@@ -195,7 +195,7 @@ var endRob = function(){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -46,7 +46,7 @@ var endRob = function(){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -160,7 +160,7 @@ var stopSB = function(){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -161,7 +161,7 @@ var stopSB = function(){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -34,7 +34,7 @@ var endBet = function (){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -146,7 +146,7 @@ var stopSB = function(){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -207,7 +207,7 @@ var stopSB = function(){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
@@ -34,7 +34,7 @@ var endBet = function (){
|
||||
var resetNumberTab = function(){
|
||||
isCBoot = true;
|
||||
var betStatus = $("#number_tab_status").val();
|
||||
if(betStatus == 1 || betStatus == 2){
|
||||
if(betStatus == 1 || betStatus == 2 || betStatus == 3){
|
||||
layer.confirm(lang.is_reset_number,{btn: [lang.confirm,lang.cancel],title:lang.message}, function(index){
|
||||
websocket.emit('resetNumberTab',{table_id : table_id});
|
||||
isCBoot = false;
|
||||
|
||||
Reference in New Issue
Block a user