og/Pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: '近一周'记录查询改为最近7天滚动窗口(含昨天),修复周一查不到昨天记录

Browse Source 
time_interval=3 原为'本周自然周',周一时本周从今天起、昨天属上周故查无数据,
与前端'近一周/Gần một tuần'语义不符。改为 date(d)-6 ~ date(d) 最近7天滚动,
任意一天都含昨天且无星期边界问题。仅会员记录查询(onlinechip/admin Pcapi),
代理结算 Settle.php 的本周/上周保持自然周不变。
This commit is contained in:
fengshao1227
2026-06-01 15:27:50 +08:00
parent e56ce3b132
commit 6012eff994
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/admin/controller/Pcapi.php
+6 -6
View File
@@ -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]);
application/onlinechip/controller/Pcapi.php
+6 -6
View File
@@ -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]);