From 1a29398f1e816825484569ac21fc3a3d498819d4 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Mon, 11 Jul 2022 04:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=94=AE=E5=90=8E=E5=8D=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Converters/MultiObjectConverter.cs | 3 ++ BBWY.Client/ViewModels/MainViewModel.cs | 2 +- .../ViewModels/Order/OrderListViewModel.cs | 43 ++++++++++++++----- BBWY.Client/Views/Order/OrderList.xaml | 25 +++++++++-- BBWY.Server.Business/Order/OrderBusiness.cs | 9 ++++ .../Response/Order/AfterSaleOrderResponse.cs | 11 +++++ .../Dto/Response/Order/OrderResponse.cs | 5 +++ 7 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 BBWY.Server.Model/Dto/Response/Order/AfterSaleOrderResponse.cs diff --git a/BBWY.Client/Converters/MultiObjectConverter.cs b/BBWY.Client/Converters/MultiObjectConverter.cs index 2396074d..b89dcfd9 100644 --- a/BBWY.Client/Converters/MultiObjectConverter.cs +++ b/BBWY.Client/Converters/MultiObjectConverter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Windows; using System.Windows.Data; +using System.Windows.Media; namespace BBWY.Client.Converters { @@ -60,6 +61,8 @@ namespace BBWY.Client.Converters return result.Equals("collapsed") ? Visibility.Collapsed : Visibility.Visible; if (convertResult == ConvertResult.布尔类型) return System.Convert.ToBoolean(result); + if (convertResult == ConvertResult.画刷类型) + return new SolidColorBrush((Color)ColorConverter.ConvertFromString(result)); return null; //后续自行扩展 } diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index 0857fc25..8b7de01d 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -105,7 +105,7 @@ namespace BBWY.Client.ViewModels Name="订单管理",ChildList=new List() { new MenuModel(){ Name="最近订单",Url="/Views/Order/OrderList.xaml" }, - new MenuModel(){ Name="售后管理",Url="/Views/Order/OrderList.xaml" } + //new MenuModel(){ Name="售后管理",Url="/Views/Order/OrderList.xaml" } } }, new MenuModel() diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 621f56b0..18007d72 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -42,8 +42,8 @@ namespace BBWY.Client.ViewModels private bool excludeSD; private bool excludeCanceled; private Random random; - private GlobalContext globalContext; + private bool includeAfterOrder; public IList OrderList { get; set; } @@ -72,6 +72,8 @@ namespace BBWY.Client.ViewModels public bool ExcludeSD { get => excludeSD; set { Set(ref excludeSD, value); } } public bool ExcludeCanceled { get => excludeCanceled; set { Set(ref excludeCanceled, value); } } + public bool IncludeAfterOrder { get => includeAfterOrder; set { Set(ref includeAfterOrder, value); } } + public ToDayOrderAchievement ToDayOrderAchievement { get; set; } public ICommand SetOrderStateCommand { get; set; } @@ -100,6 +102,8 @@ namespace BBWY.Client.ViewModels public ICommand EditVenderRemarkCommand { get; set; } + public ICommand SetIncludeAfterOrderCommand { get; set; } + public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel) { random = new Random(); @@ -108,9 +112,11 @@ namespace BBWY.Client.ViewModels this.statisticsService = statisticsService; this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel; OrderList = new ObservableCollection(); - EndDate = DateTime.Now; - StartDate = DateTime.Now.Date.AddDays(-6); + //EndDate = DateTime.Now; + //StartDate = DateTime.Now.Date.AddDays(-6); ToDayOrderAchievement = new ToDayOrderAchievement(); + InitSearchParam(); + SetOrderStateCommand = new RelayCommand(SetOrderState); SearchOrderCommand = new RelayCommand(() => { @@ -153,9 +159,24 @@ namespace BBWY.Client.ViewModels OutStockCommand = new RelayCommand((o) => OutStock(o)); EditVenderRemarkCommand = new RelayCommand(EditVenderRemark); ExportCommand = new RelayCommand(Export); + SetIncludeAfterOrderCommand = new RelayCommand(SetIncludeAfterOrder); SearchOrderCommand.Execute(null); } + private void InitSearchParam() + { + this.OrderState = null; + SearchOrderId = String.Empty; + SearchContactName = String.Empty; + SearchProductNo = String.Empty; + SearchSku = String.Empty; + SearchWaybill = String.Empty; + EndDate = DateTime.Now; + StartDate = DateTime.Now.Date.AddDays(-6); + PageIndex = 1; + IncludeAfterOrder = false; + } + public override void Refresh() { OrderList.Clear(); @@ -175,15 +196,15 @@ namespace BBWY.Client.ViewModels public void SetOrderState(OrderState? orderState) { + InitSearchParam(); this.OrderState = orderState; - SearchOrderId = String.Empty; - SearchContactName = String.Empty; - SearchProductNo = String.Empty; - SearchSku = String.Empty; - SearchWaybill = String.Empty; - EndDate = DateTime.Now; - StartDate = DateTime.Now.Date.AddDays(-6); - PageIndex = 1; + Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单 + } + + public void SetIncludeAfterOrder() + { + InitSearchParam(); + IncludeAfterOrder = true; Task.Factory.StartNew(() => LoadOrder(1)); //选择状态查询订单 } diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml index 307c2a5b..c371946a 100644 --- a/BBWY.Client/Views/Order/OrderList.xaml +++ b/BBWY.Client/Views/Order/OrderList.xaml @@ -54,10 +54,25 @@ + + Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Null}"> + + + + + + + + + + + + + + diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index ebea2ad4..8d624024 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -198,6 +198,15 @@ namespace BBWY.Server.Business order.OrderCostDetailList = orderCostDetailList.Where(ocd => ocd.OrderId == order.Id).ToList(); #endregion + #region 处理售后信息 + if (searchOrderRequest.IsContainsAfterSaleOrder) + { + var afterSaleOrderList = fsql.Select().Where(aso => orderIdList.Contains(aso.OrderId)).ToList(); + foreach (var order in orderList) + order.AfterSaleOrderList = afterSaleOrderList.Where(aso => aso.OrderId == order.Id).ToList(); + } + #endregion + #region 翻译仓库Id foreach (var order in orderList) order.StoreName = globalConfig.Stores.FirstOrDefault(s => s.StoreId == order.StoreId)?.StoreName ?? order.StoreId; diff --git a/BBWY.Server.Model/Dto/Response/Order/AfterSaleOrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/AfterSaleOrderResponse.cs new file mode 100644 index 00000000..cdd94b2b --- /dev/null +++ b/BBWY.Server.Model/Dto/Response/Order/AfterSaleOrderResponse.cs @@ -0,0 +1,11 @@ +using BBWY.Server.Model.Db; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.Server.Model.Dto +{ + public class AfterSaleOrderResponse : AfterSaleOrder + { + } +} diff --git a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs index 7546709a..45268dce 100644 --- a/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Order/OrderResponse.cs @@ -184,6 +184,11 @@ namespace BBWY.Server.Model.Dto /// 代发信息 /// public IList OrderDropShippingList { get; set; } + + /// + /// 售后信息 + /// + public IList AfterSaleOrderList { get; set; } } public class OrderListResponse