From d33382460f532baaa46591d7773ec699152d9cb5 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 21 Dec 2023 19:20:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E8=AE=AE?=
 =?UTF-8?q?=E4=BB=B7=E4=BB=BB=E5=8A=A1=E7=BC=BA=E5=B0=91tasktype=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/Sync/OrderSyncBusiness.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index fd16504..d63ccd0 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/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

From 65eeaef937b1649929560493508abd8885e7ef31 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 21 Dec 2023 19:34:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D5=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TimeLimitTask/TimeLimitRules.cs                  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
index cb96d12..6193de3 100644
--- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
+++ b/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);

From c19929d99cd1f4fd53dd64040f0d378bbcfc7780 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 22 Dec 2023 00:28:50 +0800
Subject: [PATCH 3/3] 1

---
 BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
index 6193de3..75b501e 100644
--- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
+++ b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs
@@ -291,7 +291,6 @@ namespace BBWYB.Server.Business
                         startTime = startTime.Date.AddDays(CalculateAddDay(startTime.DayOfWeek)).AddHours(9);
                     }
                 }
-
             }
             return lessTime;
         }