From e56ce3b13276a9f68ad1e4fbc0e38714679c1956 Mon Sep 17 00:00:00 2001
From: li <fengshao1227@gmail.com>
Date: Sun, 31 May 2026 20:15:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97(?=
 =?UTF-8?q?=E6=B4=97=E7=A0=81/=E8=BF=94=E6=B0=B4)=E5=91=A8=E7=95=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9C=A8=E5=91=A8=E6=97=A5(date(w)=3D0)?=
 =?UTF-8?q?=E7=AE=97=E6=88=90=E4=B8=8B=E5=91=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Settle.php xima()/rebate() 的本周/上周周界同样受 date(w) 周日=0 影响,
周日会把本周算成下周、上周算成本周, 导致代理结算页查无未结数据或周次错位.
统一 date(w)->date(w)?:7, -7 上周偏移保留, 周一~周六零影响.
---
 application/agent/controller/Settle.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/agent/controller/Settle.php b/application/agent/controller/Settle.php
index cacfca2..7c4b181 100644
--- a/application/agent/controller/Settle.php
+++ b/application/agent/controller/Settle.php
@@ -30,12 +30,12 @@ class Settle Extends Common{
 			if($timeLength == 1 || $timeLength == 2){
 				if($timeLength == 1){
 					//上周时间
-					$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1-7,date("Y")));
-					$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7-7,date("Y")));
+					$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1-7,date("Y")));
+					$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7-7,date("Y")));
 				}elseif($timeLength == 2){
 					//本周时间
-					$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1,date("Y")));
-					$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")));
+					$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1,date("Y")));
+					$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")));
 				}
 				$startTime = strtotime($weekStart);
 				$endTime = strtotime($weekEnd);
@@ -474,12 +474,12 @@ class Settle Extends Common{
             if($timeLength == 1 || $timeLength == 2){
                 if($timeLength == 1){
                     //上周时间
-                    $weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1-7,date("Y")));
-                    $weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7-7,date("Y")));
+                    $weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1-7,date("Y")));
+                    $weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7-7,date("Y")));
                 }elseif($timeLength == 2){
                     //本周时间
-                    $weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1,date("Y")));
-                    $weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")));
+                    $weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1,date("Y")));
+                    $weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")));
                 }
                 $startTime = strtotime($weekStart);
                 $endTime = strtotime($weekEnd);