退回

src/Hotline/Settings/TimeLimitDomain/ExpireTimeLimitBase.cs

@@ -78,15 +78,26 @@ public abstract class ExpireTimeLimitBase
 
     public virtual async Task<DateTime> WorkDay_ZG(DateTime date)
     {
-	    date = date.AddDays(1);
+	 
 		if (await IsWorkDay(date))
-	    {
-		    var workTime = GetWorkTimes(SettingConstants.WorkTime);
-		    var (WorkBeginTime, WorkEndTime) = GetWorkTime(date, workTime);
-			if (date > WorkBeginTime && date < WorkEndTime)
-		    {
-			    date = date.AddDays(1);
-		    }
+		{
+			var workTime = GetWorkTimes(SettingConstants.WorkTime);
+			var (WorkBeginTime, WorkEndTime) = GetWorkTime(date, workTime);
+            if (date > WorkBeginTime && date < WorkEndTime)
+            {
+                date = date.AddDays(1);
+				while (await NotWorkDay(date))
+				{
+					date = date.AddDays(1);
+				}
+			}
+            else {
+				date = WorkBeginTime.AddDays(2);
+				while (await NotWorkDay(date))
+				{
+					date = date.AddDays(1);
+				}
+			}
 	    }
 	    else
 	    {
@@ -94,7 +105,6 @@ public abstract class ExpireTimeLimitBase
 		    {
 			    date = date.AddDays(1);
 		    }
-			
 			date = DateTime.Parse(date.ToShortDateString() + "18:00");
 		}
 	    return date;