采购接口增加以采购商形式返回金额

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
                 };

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; }
 

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; }
     }
 }