From 9f7373c97eb39fc4fc8730c6bee8d520ff057db0 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 14 Aug 2023 01:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=96=B9=E6=A1=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=85=8D=E4=BB=B6=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseScheme/PurchaseSchemeBusiness.cs  | 29 ++++++++++++++-----
 .../PurchaseScheme/QuerySchemeRequest.cs      |  9 ++++--
 .../PurchaseSchemeProductSkuResponse.cs       | 21 ++++++++++----
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 931a9b2..8e15c73 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -154,7 +154,7 @@ namespace BBWYB.Server.Business
         }
 
         /// <summary>
-        /// 获取采购方案(不含采购配配件基本信息)
+        /// 获取采购方案
         /// </summary>
         /// <param name="querySchemeRequest"></param>
         /// <returns></returns>
@@ -172,19 +172,12 @@ namespace BBWYB.Server.Business
 
                 if (request.PurchasePlatform != null || !string.IsNullOrEmpty(request.PurchaserId))
                 {
-                    //var childSelect = fsql.Select<PurchaseSchemeProduct, Purchaser>()
-                    //                      .InnerJoin((psp, p) => psp.PurchaserId == p.Id)
-                    //                      .WhereIf(request.PurchasePlatform != null, (psp, p) => p.Platform == request.PurchasePlatform)
-                    //                      .WhereIf(!string.IsNullOrEmpty(request.PurchaserId), (psp, p) => psp.PurchaserId == request.PurchaserId);
-                    //select = select.Where(ps => childSelect.Where((psp, p) => psp.SkuPurchaseSchemeId == ps.Id).Any());
-
                     select = select.Where(ps => fsql.Select<PurchaseSchemeProduct, Purchaser>()
                                                     .InnerJoin((psp, p) => psp.PurchaserId == p.Id)
                                                     .WhereIf(request.PurchasePlatform != null, (psp, p) => p.Platform == request.PurchasePlatform)
                                                     .WhereIf(!string.IsNullOrEmpty(request.PurchaserId), (psp, p) => psp.PurchaserId == request.PurchaserId)
                                                     .Where((psp, p) => psp.SkuPurchaseSchemeId == ps.Id).Any());
                 }
-                //.WhereIf(querySchemeRequest.PurchasePlatform != null, ps => ps.PurchasePlatform == querySchemeRequest.PurchasePlatform);
             }
             var sql = select.ToSql();
             var purchaseSchemeList = select.ToList<PurchaseSchemeResponse>();
@@ -247,6 +240,26 @@ namespace BBWYB.Server.Business
                         }
                     }
                     #endregion
+
+                    #region 获取采购方案基本信息
+                    if (request.IncludePurchaseSkuBasicInfo == 1)
+                    {
+                        foreach (var schemeProduct in schemeProductList)
+                        {
+                            try
+                            {
+                                var basicInfo = GetPurchaseSkuBasicInfo(new PurchaseSkuBasicInfoRequest()
+                                {
+
+                                });
+                            }
+                            catch
+                            {
+
+                            }
+                        }
+                    }
+                    #endregion
                 }
             }
             return purchaseSchemeList;
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs
index 59e2088..0c2c4f1 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs
@@ -19,13 +19,18 @@ namespace BBWYB.Server.Model.Dto
         public IList<string> SkuIdList { get; set; }
 
         /// <summary>
-        /// 采购商Id, 可空
+        /// 采购商Id, 只要其中一个采购商品满足采购商条件则命中查询
         /// </summary>
         public string PurchaserId { get; set; }
 
         /// <summary>
-        /// 采购平台
+        /// 采购平台, 只要其中一个采购商品满足平台条件则命中查询
         /// </summary>
         public Enums.Platform? PurchasePlatform { get; set; }
+
+        /// <summary>
+        /// 是否包含采购配件的基本信息(单价,Logo,标题等) 是=1 否=0或null
+        /// </summary>
+        public int? IncludePurchaseSkuBasicInfo { get; set; }
     }
 }
diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs
index 7374eaa..30942ea 100644
--- a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeProductSkuResponse.cs
@@ -1,10 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BBWYB.Server.Model.Dto
+namespace BBWYB.Server.Model.Dto
 {
     public class PurchaseSchemeProductSkuResponse : Model.Db.PurchaseSchemeProductSku
     {
+
+        /// <summary>
+        /// 采购SKU标题 仅在查询条件IncludePurchaseSkuBasicInfo=1时具备该值
+        /// </summary>
+        public string PurchaseSkuTitle { get; set; }
+
+        /// <summary>
+        /// 采购SKULogo 仅在查询条件IncludePurchaseSkuBasicInfo=1时具备该值
+        /// </summary>
+        public string PurchaseSkuLogo { get; set; }
+
+        /// <summary>
+        /// 采购SKU单价 仅在查询条件IncludePurchaseSkuBasicInfo=1时具备该值
+        /// </summary>
+        public decimal? PurchaseSkuPrice { get; set; }
     }
 }