From d3b264f90658dbf2d53229228d2e76403154b7de Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 12 Apr 2024 13:46:25 +0800
Subject: [PATCH] 1

---
 BBWYB.Server.Business/Extensions/OrderStateExtension.cs | 5 +++--
 BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs   | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
index 088ee57..d6a5feb 100644
--- a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
+++ b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
@@ -115,9 +115,10 @@ namespace BBWYB.Server.Business
                 }
                 else if (order.IntoStoreType == Enums.IntoStoreType.厂商代发入仓)
                 {
-                    if (order.OrderState != Enums.OrderState.待核算)
-                        order.OrderState = Enums.OrderState.待验收;
+                    //if (order.OrderState != Enums.OrderState.待核算)
+                    //order.OrderState = Enums.OrderState.待验收;
 
+                    order.OrderState = Enums.OrderState.待核算;
                 }
                 else if (order.IntoStoreType == Enums.IntoStoreType.其他仓不包装)
                     order.OrderState = Enums.OrderState.待核算;
diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
index 75b501e..d8b9957 100644
--- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
+++ b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
@@ -272,7 +272,8 @@ namespace BBWYB.Server.Business
                     }
                     else
                     {
-                        lessTime += 10800;
+                        //lessTime += 10800;
+                        lessTime += Convert.ToInt32((startTime.Date.AddHours(12) - startTime).TotalSeconds);
                         startTime = startTime.Date.AddHours(13);
                     }
                 }
@@ -287,7 +288,8 @@ namespace BBWYB.Server.Business
                     }
                     else
                     {
-                        lessTime += 18000;
+                        //lessTime += 18000;
+                        lessTime += Convert.ToInt32((startTime.Date.AddHours(18) - startTime).TotalSeconds);
                         startTime = startTime.Date.AddDays(CalculateAddDay(startTime.DayOfWeek)).AddHours(9);
                     }
                 }