From a94b9f7fcc9f753d08ad370fae738a15471c1f14 Mon Sep 17 00:00:00 2001 From: li Date: Sun, 31 May 2026 20:09:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95/=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2'?= =?UTF-8?q?=E6=9C=AC=E5=91=A8'=E5=9C=A8=E5=91=A8=E6=97=A5(date(w)=3D0)?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AE=97=E6=88=90=E4=B8=8B?= =?UTF-8?q?=E5=91=A8=E5=AF=BC=E8=87=B4=E6=9F=A5=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHP date(w) 周日返回0, date(d)-date(w)+1 在周日会把本周一推到下周一, 整个本周区间变成未来时间, 注单/记录查询返回0条(仅周日触发, 周一~周六正常). 用 date(w)?:7 将周日按第7天计算, 对周一~周六零影响. 覆盖 onlinechip/Pcapi(会员端 get_user_bets 等3处) + admin/Pcapi(3处)。 --- 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 e48c724..d020a14 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")+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")); + $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")); } $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")+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")); + $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")); } $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")+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")); + $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")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]); diff --git a/application/onlinechip/controller/Pcapi.php b/application/onlinechip/controller/Pcapi.php index 76b8ac8..d5a8a3d 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")+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")); + $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")); } $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")+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")); + $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")); } $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")+1,date("Y")); - $endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")); + $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")); } $betWhere = array(); $betWhere['create_time'] = array('between',[$startTime,$endTime]);