From 6012eff9949d6e1d72d2ec7e911bf1c211f04748 Mon Sep 17 00:00:00 2001 From: li Date: Mon, 1 Jun 2026 15:27:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20'=E8=BF=91=E4=B8=80=E5=91=A8'=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E6=9C=80=E8=BF=91?= =?UTF-8?q?7=E5=A4=A9=E6=BB=9A=E5=8A=A8=E7=AA=97=E5=8F=A3(=E5=90=AB?= =?UTF-8?q?=E6=98=A8=E5=A4=A9),=E4=BF=AE=E5=A4=8D=E5=91=A8=E4=B8=80?= =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E6=98=A8=E5=A4=A9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit time_interval=3 原为'本周自然周',周一时本周从今天起、昨天属上周故查无数据, 与前端'近一周/Gần một tuần'语义不符。改为 date(d)-6 ~ date(d) 最近7天滚动, 任意一天都含昨天且无星期边界问题。仅会员记录查询(onlinechip/admin Pcapi), 代理结算 Settle.php 的本周/上周保持自然周不变。 --- application/admin/controller/Pcapi.php | 12 ++++++------ application/onlinechip/controller/Pcapi.php | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/admin/controller/Pcapi.php b/application/admin/controller/Pcapi.php index d020a14..7f24d2d 100755 --- a/application/admin/controller/Pcapi.php +++ b/application/admin/controller/Pcapi.php @@ -1240,8 +1240,8 @@ class Pcapi extends Controller{ $startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y')); $endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1; }elseif($time_interval == 3){ - $startTime = mktime(0,0,0,date("m"),date("d")-(date("w")?:7)+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")); + $startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y")); + $endTime = mktime(23,59,59,date("m"),date("d"),date("Y")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]); @@ -1571,8 +1571,8 @@ class Pcapi extends Controller{ $startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y')); $endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1; }elseif($time_interval == 3){ - $startTime = mktime(0,0,0,date("m"),date("d")-(date("w")?:7)+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")); + $startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y")); + $endTime = mktime(23,59,59,date("m"),date("d"),date("Y")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]); @@ -1639,8 +1639,8 @@ class Pcapi extends Controller{ $startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y')); $endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1; }elseif($time_interval == 3){ - $startTime = mktime(0,0,0,date("m"),date("d")-(date("w")?:7)+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")); + $startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y")); + $endTime = mktime(23,59,59,date("m"),date("d"),date("Y")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]); diff --git a/application/onlinechip/controller/Pcapi.php b/application/onlinechip/controller/Pcapi.php index d5a8a3d..6855a3d 100755 --- a/application/onlinechip/controller/Pcapi.php +++ b/application/onlinechip/controller/Pcapi.php @@ -1790,8 +1790,8 @@ class Pcapi extends Controller{ $startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y')); $endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1; }elseif($time_interval == 3){ - $startTime = mktime(0,0,0,date("m"),date("d")-(date("w")?:7)+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")); + $startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y")); + $endTime = mktime(23,59,59,date("m"),date("d"),date("Y")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]); @@ -2298,8 +2298,8 @@ class Pcapi extends Controller{ $startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y')); $endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1; }elseif($time_interval == 3){ - $startTime = mktime(0,0,0,date("m"),date("d")-(date("w")?:7)+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")); + $startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y")); + $endTime = mktime(23,59,59,date("m"),date("d"),date("Y")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]); @@ -2363,8 +2363,8 @@ class Pcapi extends Controller{ $startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y')); $endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1; }elseif($time_interval == 3){ - $startTime = mktime(0,0,0,date("m"),date("d")-(date("w")?:7)+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")); + $startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y")); + $endTime = mktime(23,59,59,date("m"),date("d"),date("Y")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]);