优化读单卡顿问题
This commit is contained in:
1 parent
7998a753cc
commit
5721d0f7f3
6 files changed
+293
-267
No files matched your search
@@ -327,7 +327,7 @@
|
||||
Checked="chkSubFilterSonditions_Checked"
|
||||
Content="过滤多商品订单"
|
||||
FontSize="12"
|
||||
IsChecked="{Binding orderFilterConfig.chkHideGreenFlagIsChecked}"
|
||||
IsChecked="{Binding orderFilterConfig.chkNoMultiOrderIsChecked}"
|
||||
Unchecked="chkSubFilterSonditions_Checked" />
|
||||
<Polyline
|
||||
Grid.Column="5"
|
||||
|
||||
@@ -970,59 +970,59 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
if (order.OrderBuyType == "直发" || order.OrderBuyType == "云改直")
|
||||
{
|
||||
//if (order.out_after_sale_status.ParseToString().Contains("待用户发货") && !(orderItem.DistribReturnOrderInfo?.real_logistics_express_code).IsNullOrEmpty())
|
||||
//{
|
||||
// string orderSn = order.out_order_no;
|
||||
// if (orderSn.IsNullOrEmpty())
|
||||
// continue;
|
||||
// string buyerNickName = order.out_account;
|
||||
// if (buyerNickName.IsNullOrEmpty())
|
||||
// continue;
|
||||
// var buyer = GlobalConfig.PDDBuyerLoginList.ToList().FirstOrDefault(b => b.buyer_nick == buyerNickName);
|
||||
// if (buyer == null)
|
||||
// continue;
|
||||
// var afterSalesId = orderItem.PddBuyerAfterSale?.afterSalesId;
|
||||
// if (string.IsNullOrEmpty(afterSalesId))
|
||||
// continue;
|
||||
// var waybillId = orderItem.DistribReturnOrderInfo?.real_logistics_express_code;
|
||||
if (order.out_after_sale_status.ParseToString().Contains("待用户发货") && !(orderItem.DistribReturnOrderInfo?.real_logistics_express_code).IsNullOrEmpty())
|
||||
{
|
||||
string orderSn = order.out_order_no;
|
||||
if (orderSn.IsNullOrEmpty())
|
||||
continue;
|
||||
string buyerNickName = order.out_account;
|
||||
if (buyerNickName.IsNullOrEmpty())
|
||||
continue;
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.ToList().FirstOrDefault(b => b.buyer_nick == buyerNickName);
|
||||
if (buyer == null)
|
||||
continue;
|
||||
var afterSalesId = orderItem.PddBuyerAfterSale?.afterSalesId;
|
||||
if (string.IsNullOrEmpty(afterSalesId))
|
||||
continue;
|
||||
var waybillId = orderItem.DistribReturnOrderInfo?.real_logistics_express_code;
|
||||
|
||||
// var chkRst = AddReturnPddShopPackageInfocheck(buyer, orderSn, afterSalesId, waybillId);
|
||||
// var type = 4;
|
||||
// if (chkRst.Contains("\"interactType\":0"))
|
||||
// type = 2;
|
||||
// var result = AddReturnPddShopPackageInfo(buyer, orderSn, afterSalesId, waybillId, "韵达快递", "121", type.ToString());
|
||||
// if (!result.Contains("\"result\":\"ok\""))
|
||||
// {
|
||||
// type = type == 4 ? 2 : 4;
|
||||
// result = AddReturnPddShopPackageInfo(buyer, orderSn, afterSalesId, waybillId, "韵达快递", "121", type.ToString());
|
||||
// }
|
||||
var chkRst = AddReturnPddShopPackageInfocheck(buyer, orderSn, afterSalesId, waybillId);
|
||||
var type = 4;
|
||||
if (chkRst.Contains("\"interactType\":0"))
|
||||
type = 2;
|
||||
var result = AddReturnPddShopPackageInfo(buyer, orderSn, afterSalesId, waybillId, "韵达快递", "121", type.ToString());
|
||||
if (!result.Contains("\"result\":\"ok\""))
|
||||
{
|
||||
type = type == 4 ? 2 : 4;
|
||||
result = AddReturnPddShopPackageInfo(buyer, orderSn, afterSalesId, waybillId, "韵达快递", "121", type.ToString());
|
||||
}
|
||||
|
||||
// if (result.Contains("\"result\":\"ok\""))
|
||||
// {
|
||||
// order.out_after_sale_status = "商家处理中";
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// order.out_after_sale_status = "待用户发货 自动退货失败";
|
||||
// }
|
||||
// var pddBuyerOrderLiteInfo = new PddBuyerOrderLiteInfo()
|
||||
// {
|
||||
// ShopOrderIdStr = orderItem.order_id,
|
||||
// order_sn = orderSn,
|
||||
// };
|
||||
// // 更新中转仓退货信息
|
||||
// var e57Rst = PDDBuyerOrderReadCtrl.SendAfterSaleE57NeedManual(pddBuyerOrderLiteInfo, order.out_after_sale_status);
|
||||
// if (e57Rst.Contains("<code>0</code>") || e57Rst.Contains("<code>200</code>"))
|
||||
// {
|
||||
// BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功", "Msg", 3);
|
||||
// Thread.Sleep(Randomx.GetId(10000, 12001));
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// var msg = BaseRegex.GetStringXml(ref e57Rst, "msg");
|
||||
// BaseMsgWindow.ShowAnimateMessage("买手退款信息更新失败,服务端返回 " + msg, "Error", 5);
|
||||
// }
|
||||
//}
|
||||
if (result.Contains("\"result\":\"ok\""))
|
||||
{
|
||||
order.out_after_sale_status = "商家处理中";
|
||||
}
|
||||
else
|
||||
{
|
||||
order.out_after_sale_status = "待用户发货 自动退货失败";
|
||||
}
|
||||
var pddBuyerOrderLiteInfo = new PddBuyerOrderLiteInfo()
|
||||
{
|
||||
ShopOrderIdStr = orderItem.order_id,
|
||||
order_sn = orderSn,
|
||||
};
|
||||
// 更新中转仓退货信息
|
||||
var e57Rst = PDDBuyerOrderReadCtrl.SendAfterSaleE57NeedManual(pddBuyerOrderLiteInfo, order.out_after_sale_status);
|
||||
if (e57Rst.Contains("<code>0</code>") || e57Rst.Contains("<code>200</code>"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功", "Msg", 3);
|
||||
Thread.Sleep(Randomx.GetId(10000, 12001));
|
||||
}
|
||||
else
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref e57Rst, "msg");
|
||||
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新失败,服务端返回 " + msg, "Error", 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1107,77 +1107,103 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).ToList();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待采购(" + userOrderLst.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待采购(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).ToList();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待发货(" + userOrderLst.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsWaitSend).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待发货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).ToList();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待收货(" + userOrderLst.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
var lstCount = userOrderLst.Where(r => r.IsWaitReceive).Count();
|
||||
var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")).Count();
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "待收货(" + lstCount + "|" + filteLstTmpCount + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("售后完成单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单")).ToList();
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "售后完成单(" + userOrderLst.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("需处理售后单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单")).ToList();
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "需处理售后单(" + userOrderLst.Where(r => r.IsEmergencyManualReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退货仓自动售后单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单")).ToList();
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "退货仓自动售后单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "退货仓自动售后单(" + userOrderLst.Where(r => r.IsEmergencyDistribReturnOrder).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常单")).ToList();
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "异常单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "异常单(" + userOrderLst.Where(r => r.isAbnormal).Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => { tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单")); }));
|
||||
if (tabItem != null)
|
||||
{
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单")).ToList();
|
||||
var filteLstTmp = userOrderLst.Where(o => !GetOrderIsFilter(o, "全部订单"));
|
||||
Dispatcher.Invoke(new Action(() => { tabItem.Header = "全部订单(" + userOrderLst.Count() + "|" + filteLstTmp.Count() + ")"; }));
|
||||
}
|
||||
//txtMsg.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count() + " 条订单记录";
|
||||
}
|
||||
|
||||
CancellationTokenSource TokenSource = null;
|
||||
public void FilterOrders()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (this.lbxOrder == null)
|
||||
return;
|
||||
if (TokenSource != null)
|
||||
TokenSource.Cancel();
|
||||
TokenSource = new CancellationTokenSource();
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
Task.Run(() =>
|
||||
{
|
||||
var token = TokenSource.Token;
|
||||
try
|
||||
{
|
||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime));
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单"))
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.update_time));
|
||||
else
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time));
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
if (this.lbxOrder == null)
|
||||
return;
|
||||
|
||||
disPlayOrderTabOrderCount();
|
||||
}));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
var orderLstTmp = new List<oms_wei_order_info>();
|
||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.RefundDatetime).ToList();
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常单"))
|
||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.update_time).ToList();
|
||||
else
|
||||
orderLstTmp = GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)).OrderByDescending(o => o.create_time).ToList();
|
||||
|
||||
Task.Run(() => { disPlayOrderTabOrderCount(); });
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
//GlobalConfig.lstFilterOrder = new ObservableCollectionThreadSafe<oms_wei_order_info>(orderLstTmp);
|
||||
//this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
GlobalConfig.lstFilterOrder.Clear();
|
||||
}));
|
||||
foreach (var order in orderLstTmp)
|
||||
{
|
||||
if (token.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
if (!GlobalConfig.lstFilterOrder.Any(o => o.order_id == order.order_id))
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}));
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void FilterOneOrder(string orderId, bool updateTabCount = false)
|
||||
@@ -1217,10 +1243,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
if (updateTabCount)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
disPlayOrderTabOrderCount();
|
||||
}));
|
||||
//Dispatcher.Invoke(new Action(() =>
|
||||
//{
|
||||
//}));
|
||||
disPlayOrderTabOrderCount();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1362,16 +1388,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}));
|
||||
if (filterTimeRst)
|
||||
return filterTimeRst;
|
||||
|
||||
var filterHeadStrRst = false;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
filterHeadStrRst = FilterTabPage(order, filterHeadStr);
|
||||
}));
|
||||
if (filterHeadStrRst)
|
||||
return filterHeadStrRst;
|
||||
}
|
||||
|
||||
var filterHeadStrRst = false;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
filterHeadStrRst = FilterTabPage(order, filterHeadStr);
|
||||
}));
|
||||
if (filterHeadStrRst)
|
||||
return filterHeadStrRst;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user