优化读拼多多买手单
This commit is contained in:
1 parent
f89670877d
commit
a31b87b512
9 files changed
+451
-386
No files matched your search
@@ -1270,7 +1270,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowAnimateMessage("订单扩展信息查询失败 " + ex.Message, "Error", 5);
|
||||
}
|
||||
}
|
||||
if (index % 5 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1)
|
||||
if (index % 10 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1)
|
||||
disPlayOrderTabOrderCount();
|
||||
}
|
||||
}
|
||||
@@ -1628,7 +1628,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
TokenSource.Cancel();
|
||||
TokenSource = new CancellationTokenSource();
|
||||
|
||||
Task.Run(() =>
|
||||
Task.Run(async () =>
|
||||
{
|
||||
var token = TokenSource.Token;
|
||||
try
|
||||
@@ -1636,15 +1636,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (this.lbxOrder == null)
|
||||
return;
|
||||
|
||||
if (token.IsCancellationRequested)
|
||||
return;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Clear();
|
||||
//GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(orderLstTmp);
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>();
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
}));
|
||||
//if (token.IsCancellationRequested)
|
||||
// return;
|
||||
//Dispatcher.Invoke(new Action(() =>
|
||||
//{
|
||||
// GlobalConfig.lstFilterOrder.Clear();
|
||||
// //GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(orderLstTmp);
|
||||
// GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>();
|
||||
// this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
//}));
|
||||
|
||||
if (token.IsCancellationRequested)
|
||||
return;
|
||||
@@ -1656,31 +1656,42 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
else
|
||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time).ToList();
|
||||
|
||||
//if (token.IsCancellationRequested)
|
||||
// return;
|
||||
//disPlayOrderTabOrderCount();
|
||||
|
||||
////int n = 0;
|
||||
//foreach (var order in orderLstTmp)
|
||||
//{
|
||||
// //if (n++ % 10 == 0)
|
||||
// //Thread.Sleep(1);
|
||||
|
||||
// if (token.IsCancellationRequested)
|
||||
// break;
|
||||
|
||||
// var orders = GlobalConfig.lstFilterOrder.ToList();
|
||||
// if (!orders.Any(o => o.order_id == order.order_id))
|
||||
// {
|
||||
// Dispatcher.InvokeAsync(() =>
|
||||
// {
|
||||
// lock (MainWindow._orderLock)
|
||||
// {
|
||||
// GlobalConfig.lstFilterOrder.Add(order);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//}
|
||||
|
||||
if (token.IsCancellationRequested)
|
||||
return;
|
||||
disPlayOrderTabOrderCount();
|
||||
|
||||
int n = 0;
|
||||
foreach (var order in orderLstTmp)
|
||||
await Dispatcher.InvokeAsync(new Action(() =>
|
||||
{
|
||||
//if (n++ % 10 == 0)
|
||||
Thread.Sleep(1);
|
||||
GlobalConfig.lstFilterOrder.Clear();
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(orderLstTmp);
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
}));
|
||||
|
||||
if (token.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
var orders = GlobalConfig.lstFilterOrder.ToList();
|
||||
if (!orders.Any(o => o.order_id == order.order_id))
|
||||
{
|
||||
Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
await disPlayOrderTabOrderCount();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -2306,9 +2317,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (this.IsLoaded)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Clear();
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>();
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
//GlobalConfig.lstFilterOrder.Clear();
|
||||
//GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>();
|
||||
//this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
|
||||
dgHeaderTime.Header = ColumnHeaderTitle = "交易时间 ▼";
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user