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(); + 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 @@ /// /// 采购单号 /// - 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 @@ /// 扩展数据 下单需要 /// public string Extensions { get; set; } + + /// + /// 以采购商分组的报价金额列表 + /// + public List PreviewAmountGroupByPurchaserList { get; set; } + } + + /// + /// 以采购商分组的报价金额 + /// + public class PreviewAmountGroupByPurchaser + { + /// + /// 采购商Id + /// + public string PurchaserId { get; set; } + + /// + /// 采购商名称 + /// + public string PurchaserName { get; set; } + + public Enums.Platform PurchasePlatform { get; set; } + + /// + /// 总金额 + /// + public decimal TotalAmount { get; set; } + + /// + /// 货款 + /// + public decimal ProductAmount { get; set; } + + /// + /// 运费 + /// + public decimal FreightAmount { get; set; } } }