fix: 修复会员记录/报表查询'本周'在周日(date(w)=0)时间范围算成下周导致查无数据

PHP date(w) 周日返回0, date(d)-date(w)+1 在周日会把本周一推到下周一,
整个本周区间变成未来时间, 注单/记录查询返回0条(仅周日触发, 周一~周六正常).
用 date(w)?:7 将周日按第7天计算, 对周一~周六零影响.
覆盖 onlinechip/Pcapi(会员端 get_user_bets 等3处) + admin/Pcapi(3处)。
This commit is contained in:
2026-05-31 20:09:18 +08:00
parent fbeb9787dc
commit a94b9f7fcc
2 changed files with 12 additions and 12 deletions
+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")+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]);
+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")+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]);