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]);