|
@ -232,9 +232,9 @@ namespace BBWYB.Server.Business |
|
|
//强制过期时间在工作时间点内
|
|
|
//强制过期时间在工作时间点内
|
|
|
if (expirationTime.Hour < 9) |
|
|
if (expirationTime.Hour < 9) |
|
|
expirationTime = expirationTime.Date.AddHours(9); |
|
|
expirationTime = expirationTime.Date.AddHours(9); |
|
|
else if (expirationTime.Hour >= 12 && expirationTime.Hour < 13) |
|
|
else if (expirationTime.Hour >= 12 && expirationTime.Minute > 0 && expirationTime.Hour < 13) //排除整点结束的到期时间
|
|
|
expirationTime = expirationTime.Date.AddHours(12); |
|
|
expirationTime = expirationTime.Date.AddHours(12); |
|
|
else if (expirationTime.Hour >= 18 && expirationTime.Minute > 0) |
|
|
else if (expirationTime.Hour >= 18 && expirationTime.Minute > 0) //排除整点结束的到期时间
|
|
|
expirationTime = expirationTime.Date.AddDays(CalculateAddDay(expirationTime.DayOfWeek)).AddHours(9); |
|
|
expirationTime = expirationTime.Date.AddDays(CalculateAddDay(expirationTime.DayOfWeek)).AddHours(9); |
|
|
|
|
|
|
|
|
var startTime = DateTime.Now; |
|
|
var startTime = DateTime.Now; |
|
@ -252,7 +252,7 @@ namespace BBWYB.Server.Business |
|
|
startTime = startTime.Date.AddHours(9); |
|
|
startTime = startTime.Date.AddHours(9); |
|
|
else if (startTime.Hour >= 12 && startTime.Hour < 13) |
|
|
else if (startTime.Hour >= 12 && startTime.Hour < 13) |
|
|
startTime = startTime.Date.AddHours(13); |
|
|
startTime = startTime.Date.AddHours(13); |
|
|
else if (startTime.Hour >= 18 && startTime.Minute > 1) |
|
|
else if (startTime.Hour >= 18 && startTime.Minute > 0) |
|
|
startTime = startTime.Date.AddDays(CalculateAddDay(startTime.DayOfWeek)).AddHours(9); |
|
|
startTime = startTime.Date.AddDays(CalculateAddDay(startTime.DayOfWeek)).AddHours(9); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|