From c308d3b3950f4cddb2ff1dc3292602f3432ce61d Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 9 Oct 2022 20:48:01 +0800 Subject: [PATCH] 1 --- BBWY.Client/APIServices/OrderService.cs | 8 +++-- BBWY.Client/App.xaml.cs | 4 +-- .../ViewModels/Order/OrderListViewModel.cs | 29 +++++++++++++++++-- BBWY.Server.Business/Order/OrderBusiness.cs | 3 +- 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs index 82f8ae24..78fe11a0 100644 --- a/BBWY.Client/APIServices/OrderService.cs +++ b/BBWY.Client/APIServices/OrderService.cs @@ -240,10 +240,11 @@ namespace BBWY.Client.APIServices string contactName, int pageIndex, int pageSize, - long shopId, + long? shopId, bool onlyDF, bool excludeSD, - bool excludeCanceled) + bool excludeCanceled, + string sdOperator) { return SendRequest>(globalContext.BBYWApiHost, "api/order/ExportOrderList", new { @@ -260,7 +261,8 @@ namespace BBWY.Client.APIServices contactName, onlyDF, excludeSD, - excludeCanceled + excludeCanceled, + sdOperator }, null, HttpMethod.Post); } diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index b993e479..19c763b4 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -32,7 +32,7 @@ namespace BBWY.Client string userToken = string.Empty; #if DEBUG //齐越山鸡 - //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; //刷单组测试 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs"; @@ -45,7 +45,7 @@ namespace BBWY.Client //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDE1OTMxMjU4NjEzMDEwNDMyIiwidGVhbUlkIjoiMTQxNDkzNTcwNDQ2MjQzMDIwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQxMDY1MjV9.XeMruS0YkwI7B6nODGe-vbdUqA_PSAt4EacfRAHIjV0"; //齐越文魁 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTY4NjQ4MjU0M30.emnQNDcbqnuO2jH0Kgfk2Ui7crrwzRb986Sa511iS-U"; //齐越小一 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA1OTcyOTk3ODUzMTg0IiwidGVhbUlkIjoiMTQzOTkwNDA1MDc3NzY5MDExMiIsImV4cCI6MTY4NjQxODcyOH0.K7-MXjt_zfNK5v_08VjmCDnhAGF6SI7sEQr5sgDn7Jk"; //齐越珍珍 + //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTczOTQ5NTkzMjcwMzU4MDE2IiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIxNTcxODUyNDUwMjk2NTAwMjI0IiwiZXhwIjoxNjk2NzgwMjg5fQ.RgZ7byOeHpAHKIOM8q57gLIPNrtCDfLIV_dFD8ta-uk"; //齐越繁星兼 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTE0NjczMzA5NzQ5MjQ4IiwidGVhbUlkIjoiMTQ0ODY4MTU0NDE4ODE3MDI0MCIsImV4cCI6MTY4NjQ1OTY0Mn0.4yCbZxOtogD0N868-YgySR5A-16VNnrp8fC13VCRs20"; //齐越耐克 diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 98d4ed54..e900c9a0 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -454,7 +454,29 @@ namespace BBWY.Client.ViewModels var response = statisticsService.GetTodayAchievementStatistics(startTime, endTime, shopId); if (!response.Success) return; - App.Current.Dispatcher.Invoke(() => response.Data.Map(ToDayOrderAchievement)); + ToDayOrderAchievement.AdvCost = response.Data.AdvCost; + ToDayOrderAchievement.DeliveryExpressFreight = response.Data.DeliveryExpressFreight; + ToDayOrderAchievement.EmployereCost = response.Data.EmployeeCost; + ToDayOrderAchievement.PularizeEndDate = response.Data.PularizeEndDate; + ToDayOrderAchievement.OrderCount = response.Data.OrderCount; + ToDayOrderAchievement.PlatformCommissionAmount = response.Data.PlatformCommissionAmount; + ToDayOrderAchievement.Profit = response.Data.Profit; + ToDayOrderAchievement.ProfitRaito = response.Data.ProfitRaito; + ToDayOrderAchievement.PurchaseAmount = response.Data.PurchaseAmount; + ToDayOrderAchievement.SaleAmount = response.Data.SaleAmount; + ToDayOrderAchievement.SdCost = response.Data.SDCost; + ToDayOrderAchievement.TaxCost = response.Data.TaxCost; + ToDayOrderAchievement.TotalCost = response.Data.TotalCost; + + if (response.Data.ShoppopularizeList != null && response.Data.ShoppopularizeList.Count() > 0) + { + App.Current.Dispatcher.Invoke(() => + { + ToDayOrderAchievement.ShoppopularizeList.Clear(); + foreach (var item in response.Data.ShoppopularizeList) + ToDayOrderAchievement.ShoppopularizeList.Add(item); + }); + } } private void LoadOrderCount(DateTime startDate, DateTime endDate, long shopId) @@ -903,10 +925,11 @@ namespace BBWY.Client.ViewModels SearchContactName, pageIndex, pageSize, - globalContext.User.Shop.ShopId, + queryShopId, OnlyDF, ExcludeSD, - ExcludeCanceled)).ContinueWith(t => + ExcludeCanceled, + querySDOperator)).ContinueWith(t => { var r = t.Result; if (!r.Success) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index 539cc8c4..42e534b9 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -269,7 +269,8 @@ namespace BBWY.Server.Business .WhereIf(string.IsNullOrEmpty(searchOrderRequest.Waybill) == false, (o, ocs, oct) => o.WaybillNo == searchOrderRequest.Waybill); } - select = select.Where((o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId) + select = select.WhereIf(searchOrderRequest.ShopId != null, (o, ocs, oct) => o.ShopId == searchOrderRequest.ShopId) + .WhereIf(!string.IsNullOrEmpty(searchOrderRequest.SDOperator), (o, ocs, oct) => o.SDOperator == searchOrderRequest.SDOperator) .OrderByDescending((o, ocs, oct) => o.StartTime); var orderSourceList = select.ToList((o, ocs, oct) => new ExportOrderResponse()