diff --git a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs index 5781c2e9..4d10386b 100644 --- a/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/AfterSaleOrder/AfterSaleOrderResponse.cs @@ -109,5 +109,13 @@ namespace BBWY.Client.Models public string Logo { get; set; } public string Title { get; set; } + + public int ItemTotal { get; set; } + + public decimal Price { get; set; } + + public string ContactName { get; set; } + + public string Mobile { get; set; } } } diff --git a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs index c9f0492c..e92bd4e3 100644 --- a/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs +++ b/BBWY.Client/Models/AfterSaleOrder/AfterSaleOrder.cs @@ -109,5 +109,13 @@ namespace BBWY.Client.Models public string Logo { get; set; } public string Title { get; set; } + + public int ItemTotal { get; set; } + + public decimal Price { get; set; } + + public string ContactName { get; set; } + + public string Mobile { get; set; } } } diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml index a37b08d7..fc51f57c 100644 --- a/BBWY.Client/Views/Order/OrderList.xaml +++ b/BBWY.Client/Views/Order/OrderList.xaml @@ -313,7 +313,7 @@ Visibility="{Binding Visibility,ElementName=listbox_afterSaleOrder}"> - + @@ -961,7 +961,7 @@ - + @@ -969,13 +969,16 @@ + Height="25" + Margin="5,0,0,0"> + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs index 0ffc51a9..c7fedcd0 100644 --- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs +++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs @@ -61,7 +61,9 @@ namespace BBWY.Server.Business SkuId = aso.SkuId, Title = osku.Title, ContactName = oc.ContactName, - Mobile = oc.Mobile + Mobile = oc.Mobile, + ItemTotal = osku.ItemTotal.Value, + Price = osku.Price.Value }); return new AfterSaleOrderListResponse() { diff --git a/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs b/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs index afcd8ac6..5e03bb81 100644 --- a/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs +++ b/BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs @@ -11,5 +11,9 @@ namespace BBWY.Server.Model.Dto public string ContactName { get; set; } public string Mobile { get; set; } + + public int ItemTotal { get; set; } + + public decimal Price { get; set; } } }