Merge branch 'master' into SupplyChainOptimization

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -438,7 +438,7 @@ namespace BBWYB.Server.Business.Sync
                                                 OrderSn = o.OrderSn,
                                                 ShopId = shopId,
                                                 SkuId = osku.SkuId,
-                                                //TaskType = Enums.TimeLimitTaskType.待议价任务
+                                                TaskType = Enums.TimeLimitTaskType.待议价任务
                                             });
                                         }
                                         #endregion

BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs

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