From 6548511ddd37305465e27a9e4625742cba6cb657 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 27 Mar 2024 13:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=9B=B4=E6=96=B0=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E9=85=8D=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseScheme/PurchaseSchemeBusiness.cs    | 17 +++++++++++++++++
 ...emeProductSkuBySameSpuAndPurchaserRequest.cs |  5 +++++
 .../MergePurchaseSchemeProductSkuResponse.cs    |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index c67a3b8..0d26122 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -1078,6 +1078,17 @@ namespace BBWYB.Server.Business
                 BargainTeamIdList = user.isBargainTeam ? new List<string>() { user.bargainTeam.Id } : null,
                 IncludePurchaseSkuBasicInfo = 1
             });
+
+            List<SpuOptimizationCompetitiveTenderTask> competitiveTenderTaskList = null;
+
+            if (user.isBargainTeam && request.SpuOptimizationTaskId != null && request.SpuOptimizationTaskId != 0)
+            {
+                competitiveTenderTaskList = fsql.Select<SpuOptimizationCompetitiveTenderTask>()
+                                                   .Where(ct => ct.SpuOptimizationTaskId == request.SpuOptimizationTaskId &&
+                                                              ct.BargainTeamId == user.bargainTeam.Id)
+                                                   .ToList();
+            }
+
             var mergePssList = new List<MergePurchaseSchemeProductSkuResponse>();
             foreach (var scheme in purchaseSchemeList)
             {
@@ -1092,6 +1103,12 @@ namespace BBWYB.Server.Business
                         {
                             mergePss = pss.Map<MergePurchaseSchemeProductSkuResponse>();
                             mergePssList.Add(mergePss);
+                            if (competitiveTenderTaskList != null)
+                            {
+                                var belongCompetitiveTenderTask = competitiveTenderTaskList.FirstOrDefault(ct => ct.SchemeId == scheme.Id);
+                                if (belongCompetitiveTenderTask != null)
+                                    mergePss.IsUpdateQuotedPrice = belongCompetitiveTenderTask.IsUpdateQuotedPrice;
+                            }
                         }
                         mergePss.BelongSkuIdList.Add(pss.SkuId);
                     }
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs
index 208bcd1..9a6266f 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/GetMergePurchaseSchemeProductSkuBySameSpuAndPurchaserRequest.cs
@@ -11,5 +11,10 @@
         /// 采购商Id
         /// </summary>
         public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 优化任务Id
+        /// </summary>
+        public long? SpuOptimizationTaskId { get; set; }
     }
 }
diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
index 609441b..46c7139 100644
--- a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
@@ -92,5 +92,10 @@
         /// 是否包邮
         /// </summary>
         public bool? IsFreeFreight { get; set; } = false;
+
+        /// <summary>
+        /// 是否跟新报价
+        /// </summary>
+        public bool? IsUpdateQuotedPrice { get; set; }
     }
 }