From cf697fca81cceda5929a8e5df3d362ebfdb2b61b Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 28 May 2023 16:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=A5=E9=87=87=E8=B4=AD=E5=95=86=E5=BD=A2=E5=BC=8F?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrder/PurchaseOrderBusiness.cs    | 17 ++++++++-
 .../AssociationPurchaseOrderResponse.cs       |  2 +-
 .../PurchaseOrder/PreviewOrderResponse.cs     | 38 +++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index f8f825e..b09ed1d 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -96,6 +96,8 @@ namespace BBWYB.Server.Business
             var productAmount = 0M;
             var totalAmount = 0M;
 
+            var previewAmountGroupByPurchaserList = new List<PreviewAmountGroupByPurchaser>();
+
             foreach (var cargoParamGroup in request.CargoParamGroupList)
             {
                 var purchaseAccount = request.PurchaseAccountList.FirstOrDefault(pa => pa.PurchasePlatformId == cargoParamGroup.PurchasePlatform);
@@ -133,6 +135,16 @@ namespace BBWYB.Server.Business
                     freightAmount += response.FreightAmount;
                     productAmount += response.ProductAmount;
                     totalAmount += response.TotalAmount;
+
+                    previewAmountGroupByPurchaserList.Add(new PreviewAmountGroupByPurchaser()
+                    {
+                        FreightAmount = response.FreightAmount,
+                        ProductAmount = response.ProductAmount,
+                        TotalAmount = response.TotalAmount,
+                        PurchasePlatform = cargoParamGroup.PurchasePlatform,
+                        PurchaserId = cargoParamGroup.PurchaserId,
+                        PurchaserName = cargoParamGroup.PurchaserName
+                    });
                 }
                 catch (Exception ex)
                 {
@@ -147,7 +159,8 @@ namespace BBWYB.Server.Business
                 Extensions = JsonConvert.SerializeObject(extJArray),
                 FreightAmount = freightAmount,
                 ProductAmount = productAmount,
-                TotalAmount = totalAmount
+                TotalAmount = totalAmount,
+                PreviewAmountGroupByPurchaserList = previewAmountGroupByPurchaserList
             };
         }
 
@@ -428,7 +441,7 @@ namespace BBWYB.Server.Business
                     PurchasePlatform = purchaseOrder.PurchasePlatform.Value,
                     PurchaserId = purchaseOrder.PurchaserId,
                     PurchaserName = purchaseOrder.PurchaserName,
-                    PurchaserOrderId = purchaseOrder.PurchaseOrderId,
+                    PurchaseOrderId = purchaseOrder.PurchaseOrderId,
                     IsEnabled = purchaseOrder.IsEnabled,
                     PurchaseMethod = purchaseOrder.PurchaseMethod.Value
                 };
diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseOrder/AssociationPurchaseOrderResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseOrder/AssociationPurchaseOrderResponse.cs
index 6291511..6feb646 100644
--- a/BBWYB.Server.Model/Dto/Response/PurchaseOrder/AssociationPurchaseOrderResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/PurchaseOrder/AssociationPurchaseOrderResponse.cs
@@ -10,7 +10,7 @@
         /// <summary>
         /// 采购单号
         /// </summary>
-        public string PurchaserOrderId { get; set; }
+        public string PurchaseOrderId { get; set; }
 
         public Enums.Platform PurchasePlatform { get; set; }
 
diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs
index 913196f..a1a1d4f 100644
--- a/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/PurchaseOrder/PreviewOrderResponse.cs
@@ -21,5 +21,43 @@
         /// 扩展数据 下单需要
         /// </summary>
         public string Extensions { get; set; }
+
+        /// <summary>
+        /// 以采购商分组的报价金额列表
+        /// </summary>
+        public List<PreviewAmountGroupByPurchaser> PreviewAmountGroupByPurchaserList { get; set; }
+    }
+
+    /// <summary>
+    /// 以采购商分组的报价金额
+    /// </summary>
+    public class PreviewAmountGroupByPurchaser
+    {
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 采购商名称
+        /// </summary>
+        public string PurchaserName { get; set; }
+
+        public Enums.Platform PurchasePlatform { get; set; }
+
+        /// <summary>
+        /// 总金额
+        /// </summary>
+        public decimal TotalAmount { get; set; }
+
+        /// <summary>
+        /// 货款
+        /// </summary>
+        public decimal ProductAmount { get; set; }
+
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public decimal FreightAmount { get; set; }
     }
 }