From a5f1446bd4e5bdf734889508e694a066872d21d7 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 23 Jul 2023 01:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BD=90=E5=BA=93=E6=8E=A8=E9=80=81=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E8=AF=81=E4=BF=A1=E6=81=AF=E6=97=B6=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Server.Business/QiKuManager.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/BBWYB.Server.Business/QiKuManager.cs b/BBWYB.Server.Business/QiKuManager.cs
index 7916237..4026576 100644
--- a/BBWYB.Server.Business/QiKuManager.cs
+++ b/BBWYB.Server.Business/QiKuManager.cs
@@ -156,7 +156,7 @@ namespace BBWYB.Server.Business
                     IList<IUpdate<OrderSku>> updateOrderSkuList = new List<IUpdate<OrderSku>>();
                     List<TimeLimitTask> insertTimeLimitTaskList = new List<TimeLimitTask>();
 
-                    var dbTimeLimitTaskList = fsql.Select<TimeLimitTask>().Where(t => t.OrderId == order.Id && 
+                    var dbTimeLimitTaskList = fsql.Select<TimeLimitTask>().Where(t => t.OrderId == order.Id &&
                                                                                       t.TaskType == Enums.TimeLimitTaskType.合格证拟定任务).ToList();
                     foreach (var skuConfigured in response.Data.PackTaskSkuPurchaseSchemeIdList)
                     {
@@ -172,7 +172,7 @@ namespace BBWYB.Server.Business
                             updateOrderSkuList.Add(update);
                         }
 
-                        if (qiKuPackState == Enums.PackConfigState.待配置 && order.ShopId != 9 && !dbTimeLimitTaskList.Any(t=>t.SkuId == orderSku.SkuId))
+                        if (qiKuPackState == Enums.PackConfigState.待配置 && order.ShopId != 9 && !dbTimeLimitTaskList.Any(t => t.SkuId == orderSku.SkuId))
                         {
                             //创建合格证拟定任务
                             var t = new TimeLimitTask()
@@ -232,7 +232,16 @@ namespace BBWYB.Server.Business
             IUpdate<OrderSku> updateOrderSku = null;
 
             if (orderSku.PackConfigState != request.PackConfigState)
-                updateOrderSku = fsql.Update<OrderSku>(orderSku.Id).Set(osku => osku.PackConfigState, request.PackConfigState);
+            {
+                updateOrderSku = fsql.Select<OrderSku, Order>()
+                                     .InnerJoin((osku, o) => osku.OrderId == o.Id)
+                                     .Where((osku, o) => o.OrderState != Enums.OrderState.已取消 &&
+                                                         o.IntoStoreType == Enums.IntoStoreType.发回齐越 &&
+                                                         osku.SkuId == orderSku.SkuId &&
+                                                         osku.PackConfigState != request.PackConfigState)
+                                      .ToUpdate()
+                                      .Set(osku => osku.PackConfigState, request.PackConfigState);
+            }
 
             if (request.PackConfigState == Enums.PackConfigState.需修改)
             {
@@ -265,7 +274,7 @@ namespace BBWYB.Server.Business
 
                 updateTimeLimitTask = fsql.Update<TimeLimitTask>().Set(t => t.CompletionTime, DateTime.Now)
                                                                   .Set(t => t.IsTimely == (DateTime.Now < t.ExpirationTime ? true : false))
-                                                                  .Where(t => t.OrderId == request.OrderId)
+                                                                  //.Where(t => t.OrderId == request.OrderId)
                                                                   .Where(t => t.SkuId == orderSku.SkuId)
                                                                   .Where(t => t.CompletionTime == null)
                                                                   .Where(t => hgzTaskTypeList.Contains(t.TaskType));