feat(agent-report): 统一全部报表默认时间为 今天08:00:00~次日07:59:59
Report.php 中 18 个报表(上下水/游戏/注单/上下分/台桌/棋牌等)默认时间 从 今天00:00~此刻 统一为 今天08:00:00~次日07:59:59(博彩日), 与结算报表一致。 保留2个默认'全部时间'(startTime=0)的查询不变。
This commit is contained in:
@@ -309,14 +309,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -505,13 +505,13 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1032,13 +1032,13 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2054,14 +2054,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -2172,14 +2172,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -2269,14 +2269,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -2819,14 +2819,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -2869,13 +2869,13 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3075,14 +3075,14 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
@@ -3168,14 +3168,14 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
@@ -3275,14 +3275,14 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
@@ -3366,14 +3366,14 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
@@ -3479,14 +3479,14 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
@@ -3574,14 +3574,14 @@ class Report Extends Common{
|
|||||||
if ($startDate) {
|
if ($startDate) {
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
} else {
|
} 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);
|
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
if ($endDate) {
|
if ($endDate) {
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
} else {
|
} 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);
|
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||||
$this->assign('get', $get);
|
$this->assign('get', $get);
|
||||||
}
|
}
|
||||||
@@ -3683,14 +3683,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -3895,14 +3895,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -3994,14 +3994,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
@@ -4100,14 +4100,14 @@ class Report Extends Common{
|
|||||||
if($startDate){
|
if($startDate){
|
||||||
$startTime = strtotime($startDate);
|
$startTime = strtotime($startDate);
|
||||||
}else{
|
}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);
|
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
if($endDate){
|
if($endDate){
|
||||||
$endTime = strtotime($endDate);
|
$endTime = strtotime($endDate);
|
||||||
}else{
|
}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);
|
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||||
$this->assign('get',$get);
|
$this->assign('get',$get);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user