diff --git a/application/agent/controller/Report.php b/application/agent/controller/Report.php index af89f64..02a76b4 100755 --- a/application/agent/controller/Report.php +++ b/application/agent/controller/Report.php @@ -36,17 +36,17 @@ class Report Extends Common{ $game_id = intval(Request::instance()->get('game_id')); $export = intval(Request::instance()->get('export')); - // 转换日期时间(默认:今天07:00:00 ~ 明天06:59:59) + // 转换日期时间(默认:今天08:00:00 ~ 明天07:59:59) if ($startDate) { $startTime = strtotime($startDate); } else { - $startTime = strtotime(date('Y-m-d') . ' 07:00:00'); + $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 = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 06:59:59'); + $endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59'); $get['endDate'] = date('Y-m-d H:i:s', $endTime); } diff --git a/application/agent/lang/en-us.php b/application/agent/lang/en-us.php index da56127..bdcd99f 100755 --- a/application/agent/lang/en-us.php +++ b/application/agent/lang/en-us.php @@ -301,7 +301,7 @@ return [ 'betting_money' => 'Bet money', 'code_washing_amount' => 'Code washing amount', 'odd_code_fee' => 'Odd code fee', - 'code_amount' => 'Code amount', + 'code_amount' => 'Rebate', 'settled_code_amount' => 'Settled code amount', 'unsettled_code_amount' => 'Unsettled code amount', 'unsettled_rebate_amount' => 'Unsettled rebate amount', diff --git a/application/agent/lang/zh-cn.php b/application/agent/lang/zh-cn.php index 56d4511..3039190 100755 --- a/application/agent/lang/zh-cn.php +++ b/application/agent/lang/zh-cn.php @@ -301,7 +301,7 @@ return [ 'betting_money' => '下注金额', 'code_washing_amount' => '洗码量', 'odd_code_fee' => '注单码费', - 'code_amount' => '码量', + 'code_amount' => '码粮', 'settled_code_amount' => '已结码量', 'unsettled_code_amount' => '未结码量', 'unsettled_rebate_amount' => '未结返水', diff --git a/application/agent/lang/zh-tw.php b/application/agent/lang/zh-tw.php index 657041b..e7937f9 100755 --- a/application/agent/lang/zh-tw.php +++ b/application/agent/lang/zh-tw.php @@ -301,7 +301,7 @@ return [ 'betting_money' => '下注金額', 'code_washing_amount' => '洗碼量', 'odd_code_fee' => '注單碼費', - 'code_amount' => '碼量', + 'code_amount' => '碼糧', 'settled_code_amount' => '已結碼量', 'unsettled_code_amount' => '未結碼量', 'unsettled_rebate_amount' => '未結返水',