Bläddra i källkod

order publish

Jason 1 år sedan
förälder
incheckning
0b8ac6bd7f

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -182,7 +182,7 @@ public class OrderController : BaseController
 
         var orderVisit = new OrderVisit();
         orderVisit.No = order.No;
-        orderVisit.OrderId = id;
+        orderVisit.OrderId = order.Id;
         orderVisit.VisitState = EVisitState.WaitForVisit;
         orderVisit.PublishTime = DateTime.Now;
         string visitId = await _orderVisitRepository.AddAsync(orderVisit);

+ 13 - 0
src/Hotline/Settings/TimeLimits/TimeLimitDomainService.cs

@@ -122,6 +122,8 @@ namespace Hotline.Settings.TimeLimits
                 {
                     DateTime WorkBeginTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
                     DateTime WorkEndTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[1] + ":00");
+
+                    //处理开始时间
                     if (beginTime < WorkBeginTime)
                     {
                         beginTime = WorkBeginTime;
@@ -134,9 +136,20 @@ namespace Hotline.Settings.TimeLimits
                         }
                     }
 
+
+
+                    int minutes = 0;
                     while (true)
                     {
+                        if (!IsWorkDay(beginTime))
+                        {
 
+                        }
+                        else
+                        {
+                            beginTime = beginTime.AddDays(1);
+                            WorkEndTime = WorkEndTime.AddDays(1);
+                        }
                     }