10062

BBWY.Client/APIServices/BillCorrectionService.cs

@@ -22,5 +22,10 @@ namespace BBWY.Client.APIServices
                 endTime
             }, null, HttpMethod.Post);
         }
+
+        public ApiResponse<object> CorrectOrder(IList<BillCorrectionRequest> requestList)
+        {
+            return SendRequest<object>(globalContext.BBYWApiHost, "api/billCorrection/CorrectOrder", requestList, null, HttpMethod.Post);
+        }
     }
 }

BBWY.Client/Models/APIModel/Request/BillCorrectionRequest.cs

@@ -0,0 +1,9 @@
+namespace BBWY.Client.Models
+{
+    public class BillCorrectionRequest
+    {
+        public string OrderId { get; set; }
+
+        public decimal NewDeliveryExpressFreight { get; set; }
+    }
+}

BBWY.Client/ViewModels/BillCorrection/BillCorrectionViewModel.cs

@@ -435,6 +435,7 @@ namespace BBWY.Client.ViewModels
                 MessageBox.Show("缺少运费账单");
                 return;
             }
+
             foreach (var order in OrderList)
             {
                 //矫正销售运费
@@ -454,7 +455,8 @@ namespace BBWY.Client.ViewModels
                 //矫正出仓操作
 
             }
-
+            var correctionCount = OrderList.Count(o => !string.IsNullOrEmpty(o.ChangedContent));
+            MessageBox.Show($"矫正完成，本次矫正{correctionCount}笔订单", "矫正费用");
         }
 
         private void Clear()
@@ -489,6 +491,26 @@ namespace BBWY.Client.ViewModels
                 return;
             }
 
+            var billCorrectionOrderList = saveOrderList.Select(o => new BillCorrectionRequest()
+            {
+                OrderId = o.OrderId,
+                NewDeliveryExpressFreight = o.NewDeliveryExpressFreight
+            }).ToList();
+            IsLoading = true;
+            Task.Factory.StartNew(() => billCorrectionService.CorrectOrder(billCorrectionOrderList))
+                        .ContinueWith(t =>
+                        {
+                            IsLoading = false;
+                            var response = t.Result;
+                            if (!response.Success)
+                            {
+                                App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "矫正费用 "));
+                                return;
+                            }
+
+                            App.Current.Dispatcher.Invoke(() => MessageBox.Show("矫正账单成功", "矫正费用"));
+                            this.Clear();
+                        });
 
         }
     }

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10061" Margin="5,0,0,0"/>
+                <TextBlock Text="v10062" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Server.API/Controllers/BillCorrectionController.cs

@@ -24,5 +24,15 @@ namespace BBWY.Server.API.Controllers
         {
             return billCorrectionBusiness.GetBillCorrectionOrderList(request);
         }
+
+        /// <summary>
+        /// 矫正费用
+        /// </summary>
+        /// <param name="requestList"></param>
+        [HttpPost]
+        public void CorrectOrder([FromBody] IList<BillCorrectionRequest> requestList)
+        {
+            billCorrectionBusiness.CorrectOrder(requestList);
+        }
     }
 }