diff --git a/BBWY.Client/APIServices/AfterOrderService.cs b/BBWY.Client/APIServices/AfterOrderService.cs index 181eaaa5..326a0ac2 100644 --- a/BBWY.Client/APIServices/AfterOrderService.cs +++ b/BBWY.Client/APIServices/AfterOrderService.cs @@ -51,7 +51,8 @@ namespace BBWY.Client.APIServices ProductHealth productHealth, decimal reissueAfterSaleAmount, decimal reissueFreight, - decimal reissueProductAmount) + decimal reissueProductAmount, + decimal sdRefundFreight) { return SendRequest(globalContext.BBYWApiHost, "Api/AfterSaleOrder/EditAfterSaleOrder", new { @@ -62,7 +63,8 @@ namespace BBWY.Client.APIServices productHealth, reissueAfterSaleAmount, reissueFreight, - reissueProductAmount + reissueProductAmount, + sdRefundFreight }, null, HttpMethod.Post); } diff --git a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs index a2926417..b460c701 100644 --- a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs @@ -4,22 +4,22 @@ namespace BBWY.Client.Models { public class AfterSaleOrderResponse { - + public long Id { get; set; } - + public DateTime? CreateTime { get; set; } /// /// 申请时间 /// - + public DateTime? ApplyTime { get; set; } - + public string OrderId { get; set; } - + public string ProductId { get; set; } /// @@ -151,5 +151,10 @@ namespace BBWY.Client.Models /// 采购单主键 /// public long? PurchaseOrderPKId { get; set; } + + /// + /// 刷单退货运费 + /// + public decimal SDRefundFreight { get; set; } = 0.00M; } } diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs index 4ae88b17..04785a6d 100644 --- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs +++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs @@ -11,6 +11,7 @@ namespace BBWY.Client.Models private decimal reissueAfterSaleAmount; private decimal reissueFreight; private decimal reissueProductAmount; + private decimal sdRefundFreight; public long Id { get; set; } @@ -138,6 +139,11 @@ namespace BBWY.Client.Models /// public long? PurchaseOrderPKId { get; set; } + /// + /// SD退货运费 + /// + public decimal SDRefundFreight { get => sdRefundFreight; set { Set(ref sdRefundFreight, value); } } + public object Clone() { return this.MemberwiseClone(); diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index d08ee82c..f2e71c45 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -861,13 +861,14 @@ namespace BBWY.Client.ViewModels var afterSaleOrder = w.SaleOrder; IsLoading = true; Task.Factory.StartNew(() => afterOrderService.EditAfterSaleOrder(afterSaleOrder.Id, - afterSaleOrder.OrderId, - afterSaleOrder.ProductResult.Value, - afterSaleOrder.ServiceResult.Value, - afterSaleOrder.ProductHealth.Value, - afterSaleOrder.ReissueAfterSaleAmount, - afterSaleOrder.ReissueFreight, - afterSaleOrder.ReissueProductAmount)).ContinueWith(t => + afterSaleOrder.OrderId, + afterSaleOrder.ProductResult.Value, + afterSaleOrder.ServiceResult.Value, + afterSaleOrder.ProductHealth.Value, + afterSaleOrder.ReissueAfterSaleAmount, + afterSaleOrder.ReissueFreight, + afterSaleOrder.ReissueProductAmount, + afterSaleOrder.SDRefundFreight)).ContinueWith(t => { var response = t.Result; if (!response.Success) diff --git a/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml b/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml index 061ffb7c..a842f8d1 100644 --- a/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml +++ b/BBWY.Client/Views/Order/EditAfterSaleOrderSku.xaml @@ -41,68 +41,96 @@ - - - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + - - - + + + + + + + - - - + + + + + + + - - - + + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml index 8184a2cb..8082a419 100644 --- a/BBWY.Client/Views/Order/OrderList.xaml +++ b/BBWY.Client/Views/Order/OrderList.xaml @@ -842,8 +842,8 @@ + ToolTipService.InitialShowDelay="0" + ToolTipService.ShowDuration="10000"> @@ -880,6 +880,7 @@ + @@ -895,7 +896,7 @@ - + @@ -929,14 +930,17 @@ - - + + + + + - + @@ -947,9 +951,10 @@ - + - + + + @@ -997,8 +1003,11 @@ Visibility="{Binding RefundInStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/> - - + + @@ -1013,7 +1022,8 @@ - + + @@ -1324,7 +1334,8 @@ - + @@ -1351,6 +1362,7 @@ + @@ -1366,10 +1378,13 @@ - + - + + + + @@ -1390,10 +1405,10 @@ - + - + @@ -1426,14 +1441,18 @@ Visibility="{Binding RefundInStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/> - + - + + @@ -1444,8 +1463,8 @@ - - + + diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs index 3e5088bc..21e2813d 100644 --- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs +++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs @@ -136,7 +136,7 @@ namespace BBWY.Server.Business if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.SD退货) { dbAfterSaleOrder.SDRefundFreight = editAfterSaleOrderRequest.SDRefundFreight; - dbAfterSaleOrder.AfterTotalCost = editAfterSaleOrderRequest.SDRefundFreight; + dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.SDRefundFreight + dbAfterSaleOrder.ReissueAfterSaleAmount; } else { @@ -192,7 +192,7 @@ namespace BBWY.Server.Business dbAfterSaleOrder.PurchaseOrderPKId = dbPurchaseOrder.Id; } - dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value + + dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount + dbAfterSaleOrder.ConsumableAmount.Value + dbAfterSaleOrder.DeliveryExpressFreight.Value + dbAfterSaleOrder.FirstFreight.Value + diff --git a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs index 588c3118..7168b053 100644 --- a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs +++ b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs @@ -48,7 +48,7 @@ namespace BBWY.Server.Model.Db /// 售后补发成本 /// [Column(DbType = "decimal(20,2)")] - public decimal? ReissueAfterSaleAmount { get; set; } = 0.00M; + public decimal ReissueAfterSaleAmount { get; set; } = 0.00M; /// /// 补发运费