From 633089dedd6ad0a5b43466086701940d0352b151 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 27 Mar 2024 23:41:44 +0800
Subject: [PATCH] 1

---
 .../PurchaseScheme/PurchaseSchemeBusiness.cs         | 12 ++++++------
 BBWYB.Server.Business/Sync/ProductSyncBusiness.cs    | 10 ++++++++++
 .../MergePurchaseSchemeProductSkuResponse.cs         |  2 +-
 .../Models/Request/Product/OP_QueryProductRequest.cs | 10 ++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 9428cff..ab8d029 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -1104,12 +1104,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;
-                            }
+                        }
+                        if (competitiveTenderTaskList != null)
+                        {
+                            var belongCompetitiveTenderTask = competitiveTenderTaskList.FirstOrDefault(ct => ct.SchemeId == scheme.Id);
+                            if (belongCompetitiveTenderTask != null && belongCompetitiveTenderTask.IsUpdateQuotedPrice == true)
+                                mergePss.IsUpdateQuotedPrice = true;
                         }
                         mergePss.BelongSkuIdList.Add(pss.SkuId);
                     }
diff --git a/BBWYB.Server.Business/Sync/ProductSyncBusiness.cs b/BBWYB.Server.Business/Sync/ProductSyncBusiness.cs
index b9a9e04..04b1440 100644
--- a/BBWYB.Server.Business/Sync/ProductSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/ProductSyncBusiness.cs
@@ -35,6 +35,11 @@ namespace BBWYB.Server.Business.Sync
             }
         }
 
+        public void SyncAllShopUpdateProduct()
+        {
+
+        }
+
 
         private void SyncProduct(ShopResponse shop, bool IsSyncAllProduct = false)
         {
@@ -277,5 +282,10 @@ namespace BBWYB.Server.Business.Sync
                 nLogManager.Default().Error(ex, $"SyncProduct ShopId:{shop.ShopName}");
             }
         }
+
+        private void SyncUpdateProduct(ShopResponse shop)
+        {
+
+        }
     }
 }
diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
index 46c7139..3c4cbc5 100644
--- a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
@@ -96,6 +96,6 @@
         /// <summary>
         /// 是否跟新报价
         /// </summary>
-        public bool? IsUpdateQuotedPrice { get; set; }
+        public bool? IsUpdateQuotedPrice { get; set; } = false;
     }
 }
diff --git a/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs
index c26df80..fc3a288 100644
--- a/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs
+++ b/SDKAdapter/OperationPlatform/Models/Request/Product/OP_QueryProductRequest.cs
@@ -23,5 +23,15 @@
         /// 每页记录数
         /// </summary>
         public int PageSize { get; set; }
+
+        /// <summary>
+        /// 最后修改开始时间
+        /// </summary>
+        public DateTime? UpdateStartTime { get; set; }
+
+        /// <summary>
+        /// 最后修改结束时间
+        /// </summary>
+        public DateTime? UpdateEndTime { get; set; }
     }
 }