From 2d7b15c1ad8424e29196b01eb6e4ba9d783b129f Mon Sep 17 00:00:00 2001 From: li Date: Fri, 29 May 2026 21:15:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(agent-report):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=8A=A5=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=B8=BA=20=E4=BB=8A=E5=A4=A908:00:00~=E6=AC=A1?= =?UTF-8?q?=E6=97=A507:59:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Report.php 中 18 个报表(上下水/游戏/注单/上下分/台桌/棋牌等)默认时间 从 今天00:00~此刻 统一为 今天08:00:00~次日07:59:59(博彩日), 与结算报表一致。 保留2个默认'全部时间'(startTime=0)的查询不变。 --- application/agent/controller/Report.php | 72 ++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/application/agent/controller/Report.php b/application/agent/controller/Report.php index 02a76b4..ac1292e 100755 --- a/application/agent/controller/Report.php +++ b/application/agent/controller/Report.php @@ -309,14 +309,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -505,13 +505,13 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); } @@ -1032,13 +1032,13 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); } @@ -2054,14 +2054,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2172,14 +2172,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2269,14 +2269,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2819,14 +2819,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -2869,13 +2869,13 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); } @@ -3075,14 +3075,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3168,14 +3168,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3275,14 +3275,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3366,14 +3366,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3479,14 +3479,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3574,14 +3574,14 @@ class Report Extends Common{ if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s', $startTime); $this->assign('get', $get); } if ($endDate) { $endTime = strtotime($endDate); } else { - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); $this->assign('get', $get); } @@ -3683,14 +3683,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -3895,14 +3895,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -3994,14 +3994,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); } @@ -4100,14 +4100,14 @@ class Report Extends Common{ if($startDate){ $startTime = strtotime($startDate); }else{ - $startTime = strtotime(date('Y-m-d')); + $startTime = strtotime(date('Y-m-d') . ' 08:00:00'); $get['startDate'] = date('Y-m-d H:i:s',$startTime); $this->assign('get',$get); } if($endDate){ $endTime = strtotime($endDate); }else{ - $endTime = time(); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s',$endTime); $this->assign('get',$get); }