diff --git a/BBWYB.Client/Views/MainWindow.xaml b/BBWYB.Client/Views/MainWindow.xaml index b86f1a9..0e9be0c 100644 --- a/BBWYB.Client/Views/MainWindow.xaml +++ b/BBWYB.Client/Views/MainWindow.xaml @@ -24,7 +24,7 @@ - + diff --git a/BBWYB.Client/Views/WebB/WebB.xaml.cs b/BBWYB.Client/Views/WebB/WebB.xaml.cs index 90bd88a..bf261dd 100644 --- a/BBWYB.Client/Views/WebB/WebB.xaml.cs +++ b/BBWYB.Client/Views/WebB/WebB.xaml.cs @@ -44,7 +44,12 @@ namespace BBWYB.Client.Views.WebB shopService = s.ServiceProvider.GetRequiredService(); } - var url = "http://qtbbwy.qiyue666.com"; +#if DEBUG + var url = "http://192.168.1.2:8080"; +#else + var url = "http://qtbbwy.qiyue666.com"; +#endif + w2m.CoreWebView2InitializationCompleted = (e) => { w2m.wb2.CoreWebView2.AddHostObjectToScript("qtbbwybContext", this.globalContext); diff --git a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs index 98e3bfe..d4879dd 100644 --- a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs @@ -37,6 +37,17 @@ namespace BBWYB.Server.API.Controllers purchaseOrderBusiness.CreatePurchaseOrder(request); } + /// + /// 获取关联订单列表 + /// + /// + /// + [HttpGet("{orderId}")] + public IList GetAssociationPurchaseOrderList([FromRoute] string orderId) + { + return purchaseOrderBusiness.GetAssociationPurchaseOrderList(orderId); + } + /// /// 1688回调 /// diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 847fe46..e5c383b 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -408,7 +408,9 @@ namespace BBWYB.Server.Business PurchaserName = purchaseOrder.PurchaserName, PurchaserOrderId = purchaseOrder.PurchaseOrderId }; + var currentOrderCostDetailList = orderCostDetailList.Where(ocd => ocd.PurchaseOrderId == purchaseOrder.PurchaseOrderId).ToList(); + foreach (var orderCostDetail in currentOrderCostDetailList) { var orderSku = orderSkuList.FirstOrDefault(osku => osku.SkuId == orderCostDetail.SkuId); @@ -425,7 +427,11 @@ namespace BBWYB.Server.Business }; if (assocationOrderCostDetail.PurchaseQuantity != 0) assocationOrderCostDetail.PurchasePrice = assocationOrderCostDetail.SkuAmount / assocationOrderCostDetail.PurchaseQuantity; + + associationPurchaseOrder.AssocationOrderCostDetailList.Add(assocationOrderCostDetail); } + associationPurchaseOrder.PurchaseAmount = associationPurchaseOrder.AssocationOrderCostDetailList.Sum(x => x.SkuAmount); + associationPurchaseOrder.PurchaseFreight = associationPurchaseOrder.AssocationOrderCostDetailList.Sum(x => x.PurchaseFreight); list.Add(associationPurchaseOrder); } return list;