From e763c561f17497398b35d861d72c44d02b7b6837 Mon Sep 17 00:00:00 2001
From: li <fengshao1227@gmail.com>
Date: Fri, 29 May 2026 21:04:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(agent-report):=20=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA08:00~=E6=AC=A1=E6=97=A507:59:59,=20=E7=A0=81=E9=87=8F?=
 =?UTF-8?q?=E5=88=97=E6=94=B9=E5=90=8D=E7=A0=81=E7=B2=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Report::settle 默认日期边界 07:00/06:59:59 → 08:00/07:59:59(博彩日)
- code_amount 翻译 码量/碼量/Code amount → 码粮/碼糧/Rebate(代理后台全局)
---
 application/agent/controller/Report.php | 6 +++---
 application/agent/lang/en-us.php        | 2 +-
 application/agent/lang/zh-cn.php        | 2 +-
 application/agent/lang/zh-tw.php        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

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' => '未結返水',