From 87cf64eebb615646c7a45e26bce1435a6bec795d Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 1 Sep 2023 15:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=BA=AC=E4=B8=9C=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E4=BB=93=E5=8D=95=E4=B9=8B=E5=90=8E=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=BE=85=E6=A0=B8=E7=AE=97=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/JD/JDBusiness.cs        | 23 +++++++++++++++++++
 .../PurchaseOrder/PurchaseOrderBusiness.cs    |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/BBWYB.Server.Business/JD/JDBusiness.cs b/BBWYB.Server.Business/JD/JDBusiness.cs
index a6389aa..42fd4e6 100644
--- a/BBWYB.Server.Business/JD/JDBusiness.cs
+++ b/BBWYB.Server.Business/JD/JDBusiness.cs
@@ -65,12 +65,16 @@ namespace BBWYB.Server.Business.JD
         {
             List<string> orderIds = null;
             List<IUpdate<Order>> updateOrderList = new List<IUpdate<Order>>();
+            List<TimeLimitTask> insertTimeLimitTaskList = new List<TimeLimitTask>();
             try
             {
                 var checkTaskList = fsql.Select<InStoreOrderCheckTask>().Where(x => x.IsChecked == false).ToList();
                 if (checkTaskList.Count() == 0)
                     return;
+               
                 orderIds = checkTaskList.Select(x => x.OrderId).ToList();
+                var timelimitTaskList = fsql.Select<TimeLimitTask>().Where(t => orderIds.Contains(t.OrderId) && t.TaskType == Enums.TimeLimitTaskType.待核算任务).ToList();
+
                 var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(opi => orderIds.Contains(opi.OrderId) && opi.IsEnabled == true).ToList();
 
                 var waitCheckInStoreOrderList = fsql.Select<InStorePurchaseOrdeRrelationInfo, Order>()
@@ -184,6 +188,22 @@ namespace BBWYB.Server.Business.JD
                                 var update = fsql.Update<Order>().Set(o => o.OrderState, Enums.OrderState.待核算)
                                                                  .Where(o => o.Id == checkTask.OrderId && o.OrderState == Enums.OrderState.待验收);
                                 updateOrderList.Add(update);
+
+                                if (!timelimitTaskList.Any(t => t.OrderId == checkTask.OrderId && t.TaskType == Enums.TimeLimitTaskType.待核算任务))
+                                {
+                                    //创建待核算任务
+                                    var t = new TimeLimitTask()
+                                    {
+                                        CreateTme = DateTime.Now,
+                                        Id = idGenerator.NewLong(),
+                                        OrderId = checkTask.OrderId,
+                                        OrderSn = checkTask.OrderSn,
+                                        ShopId = checkTask.ShopId,
+                                        TaskType = Enums.TimeLimitTaskType.待核算任务,
+                                        ExpirationTime = DateTime.Now.AddDays(1)
+                                    };
+                                    insertTimeLimitTaskList.Add(t);
+                                }
                             }
                         }
                     }
@@ -212,6 +232,9 @@ namespace BBWYB.Server.Business.JD
 
                         if (orderIds != null && orderIds.Count() > 0)
                             fsql.Update<InStoreOrderCheckTask>().Set(x => x.IsChecked, true).Where(x => orderIds.Contains(x.OrderId)).ExecuteAffrows();
+
+                        if (insertTimeLimitTaskList.Count() > 0)
+                            fsql.Insert(insertTimeLimitTaskList).ExecuteAffrows();
                     });
                 }
                 catch { }
diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 5bce4dd..4af2565 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -2711,7 +2711,7 @@ namespace BBWYB.Server.Business
                             var isExists = fsql.Select<TimeLimitTask>().Where(t => t.OrderId == order.Id && t.TaskType == Enums.TimeLimitTaskType.待核算任务).Any();
                             if (!isExists)
                             {
-                                //创建合格证拟定任务
+                                //创建待核算任务
                                 var t = new TimeLimitTask()
                                 {
                                     CreateTme = DateTime.Now,