diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs index b164607f..7f26c15a 100644 --- a/BBWY.Client/APIServices/OrderService.cs +++ b/BBWY.Client/APIServices/OrderService.cs @@ -162,5 +162,10 @@ namespace BBWY.Client.APIServices AppToken = globalContext.User.Shop.AppToken }, null, HttpMethod.Post); } + + public ApiResponse SyncOrder(long shopId, DateTime startTime, DateTime endTime) + { + return SendRequest(globalContext.BBYWApiHost, "/Api/Order/SyncOrderByDate", new { shopId, startTime, endTime }, null, HttpMethod.Post); + } } } diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs index 320c224f..94f949d0 100644 --- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs +++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs @@ -76,6 +76,8 @@ namespace BBWY.Client.ViewModels public ICommand SearchOrderCommand { get; set; } + public ICommand SyncOrderCommand { get; set; } + public ICommand CopyTextCommand { get; set; } public ICommand CopyOrderWaybillCommand { get; set; } @@ -110,6 +112,7 @@ namespace BBWY.Client.ViewModels Task.Factory.StartNew(() => LoadOrder(1)); //手动点击查询订单 Task.Factory.StartNew(() => LoadTodayAchievement(StartDate, EndDate)); }); + SyncOrderCommand = new RelayCommand(SyncOrder); CopyTextCommand = new RelayCommand(s => { try @@ -470,5 +473,19 @@ namespace BBWY.Client.ViewModels //LoadOrder(PageIndex); }); } + + private void SyncOrder() + { + IsLoading = true; + Task.Factory.StartNew(() => orderService.SyncOrder(globalContext.User.Shop.ShopId, StartDate, EndDate)).ContinueWith(r => + { + IsLoading = false; + var response = r.Result; + if (response.Success) + App.Current.Dispatcher.Invoke(() => MessageBox.Show("同步任务创建成功,该任务会执行一段时间,请稍后查询订单列表观察同步结果", "同步订单")); + else + App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "同步订单")); + }); + } } } diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml index 65ec0105..4919d3ec 100644 --- a/BBWY.Client/Views/Order/OrderList.xaml +++ b/BBWY.Client/Views/Order/OrderList.xaml @@ -139,6 +139,16 @@ + + + + + + + + + +