获取关联订单列表

BBWYB.Client/Views/MainWindow.xaml

@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10016" Margin="5,0,0,0"/>
+                <TextBlock Text="v10017" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWYB.Client/Views/WebB/WebB.xaml.cs

@@ -44,7 +44,12 @@ namespace BBWYB.Client.Views.WebB
                 shopService = s.ServiceProvider.GetRequiredService<ShopService>();
             }
 
-            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);

BBWYB.Server.API/Controllers/PurchaseOrderController.cs

@@ -37,6 +37,17 @@ namespace BBWYB.Server.API.Controllers
             purchaseOrderBusiness.CreatePurchaseOrder(request);
         }
 
+        /// <summary>
+        /// 获取关联订单列表
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        [HttpGet("{orderId}")]
+        public IList<AssociationPurchaseOrderResponse> GetAssociationPurchaseOrderList([FromRoute] string orderId)
+        {
+            return purchaseOrderBusiness.GetAssociationPurchaseOrderList(orderId);
+        }
+
         /// <summary>
         /// 1688回调
         /// </summary>

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;