|
@ -178,12 +178,12 @@ namespace BBWYB.Server.Business |
|
|
if (startTime.DayOfWeek == DayOfWeek.Sunday) |
|
|
if (startTime.DayOfWeek == DayOfWeek.Sunday) |
|
|
{ |
|
|
{ |
|
|
addDay = 1; |
|
|
addDay = 1; |
|
|
addHour = 14; |
|
|
addHour = 15; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
if (startTime.Hour < 9) |
|
|
if (startTime.Hour < 9) |
|
|
addHour = 14; |
|
|
addHour = 15; |
|
|
else if (startTime.Hour >= 9 && startTime.Hour < 12) |
|
|
else if (startTime.Hour >= 9 && startTime.Hour < 12) |
|
|
{ |
|
|
{ |
|
|
addHour = 13; |
|
|
addHour = 13; |
|
@ -207,13 +207,19 @@ namespace BBWYB.Server.Business |
|
|
addHour = 9; |
|
|
addHour = 9; |
|
|
var to18senconds = Convert.ToInt32((startTime.Date.AddHours(18) - startTime).TotalSeconds); |
|
|
var to18senconds = Convert.ToInt32((startTime.Date.AddHours(18) - startTime).TotalSeconds); |
|
|
addSeconds = 18000 - to18senconds; |
|
|
addSeconds = 18000 - to18senconds; |
|
|
|
|
|
if (addSeconds > 10800) |
|
|
|
|
|
{ |
|
|
|
|
|
//到第二天9点开始也超过3个小时,就从下午13点开始计算
|
|
|
|
|
|
addHour = 13; |
|
|
|
|
|
addSeconds -= 10800; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else if (startTime.Hour >= 18) |
|
|
else if (startTime.Hour >= 18) |
|
|
{ |
|
|
{ |
|
|
//下一个工作日的18点结束
|
|
|
//下一个工作日的18点结束
|
|
|
addDay = CalculateAddDay(startTime.DayOfWeek); |
|
|
addDay = CalculateAddDay(startTime.DayOfWeek); |
|
|
addHour = 14; |
|
|
addHour = 15; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return startTime.Date.AddDays(addDay).AddHours(addHour).AddSeconds(addSeconds); |
|
|
return startTime.Date.AddDays(addDay).AddHours(addHour).AddSeconds(addSeconds); |
|
|