优化读拼多多买手单

This commit is contained in:
wule committed 2026-10-28 13:17:51 +08:00
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 = "交易时间 ▼";
}
@@ -430,9 +430,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
var url = BaseClass.Build29WxObjString("shop/get_shop_erp_merchant");
var data = UserLogin.GetSignaturex();
data += "&corporate_account_user_id=" + orderItem.Shop.ErpCorporateAccountUserId;
data += "&manage_user_id=" + orderItem.Shop.ErpManageUserId;
data += "&shop_id=" + orderItem.Shop.ErpShopId;
data += "&corporate_account_user_id=" + orderItem.ItemOrder.Shop.ErpCorporateAccountUserId;
data += "&manage_user_id=" + orderItem.ItemOrder.Shop.ErpManageUserId;
data += "&shop_id=" + orderItem.ItemOrder.Shop.ErpShopId;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
@@ -477,9 +477,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (orderItem.BuyGoodsBtnTxt == "去店铺后台绑定代发")
{
if (orderItem.Shop != null)
if (orderItem.ItemOrder.Shop != null)
{
WXShopLoginForm shopLoginForm = new WXShopLoginForm(orderItem.Shop);
WXShopLoginForm shopLoginForm = new WXShopLoginForm(orderItem.ItemOrder.Shop);
shopLoginForm.openType = Work._29Tools.Forms.ShopForms.EnumOpenType.manage;
shopLoginForm.WindowState = System.Windows.Forms.FormWindowState.Maximized;
shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/supply/consignmentOrderList";
@@ -504,9 +504,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//}
// 掉线提示重登
if (orderItem.Shop?.LoginStatus != "登录成功")
if (orderItem.ItemOrder?.Shop?.LoginStatus != "登录成功")
{
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == orderItem.Shop.ErpShopId).ToList())
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == orderItem.ItemOrder?.Shop?.ErpShopId).ToList())
{
// 更新代发管理情况
foreach (var oi in ord.orderItems)
@@ -707,7 +707,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
try
{
// 查询代发列表
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.ItemOrder.Shop, orderItem.order_id, 100);
if (!apiSearchDropship.Contains("\"errcode\":0"))
throw new Exception("查询代发失败!" + BaseRegex.GetStringJsonByRegs(ref apiSearchDropship, apiSearchDropship, "msg", "errmsg"));
@@ -718,7 +718,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
if (!string.IsNullOrEmpty(dsOrderId))
{
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.ItemOrder.Shop, orderItem.ItemOrder, dsOrderId);
if (!apiCancelDropship.Contains("\"errcode\":0"))
{
var errMsg = BaseRegex.GetStringJsonByRegs(ref apiCancelDropship, apiCancelDropship, "msg", "errmsg");
@@ -732,7 +732,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!string.IsNullOrEmpty(dsOrderId))
{
// 查询代发详情
var apiSearchDropshipDetail = new WxApiBLL().WxApiDropshipSearchDetail(orderItem.Shop, dsOrderId);
var apiSearchDropshipDetail = new WxApiBLL().WxApiDropshipSearchDetail(orderItem.ItemOrder.Shop, dsOrderId);
if (!apiSearchDropshipDetail.Contains("\"errcode\":0"))
throw new Exception("查询代发失详情失败!" + BaseRegex.GetStringJson(ref apiSearchDropshipDetail, "msg"));
@@ -741,7 +741,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!string.IsNullOrEmpty(supplierId) && !supplierId.Contains(targetSupplierId) && !supplierName.Contains(targetSupplierName))
{
// 取消代发
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.ItemOrder.Shop, orderItem.ItemOrder, dsOrderId);
if (!apiCancelDropship.Contains("\"errcode\":0"))
{
var errMsg = BaseRegex.GetStringJsonByRegs(ref apiCancelDropship, apiCancelDropship, "msg", "errmsg");
@@ -757,7 +757,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!supplierId.Contains(targetSupplierId) && !supplierName.Contains(targetSupplierName))
{
// 设置29供货商代发wxfc630d60a1af6c6f或其他代发
var apiAddDropship = new WxApiBLL().WxApiDropshipAssign(orderItem.Shop, orderItem.order_id, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt(), targetSupplierId);
var apiAddDropship = new WxApiBLL().WxApiDropshipAssign(orderItem.ItemOrder.Shop, orderItem.order_id, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt(), targetSupplierId);
if (!apiAddDropship.Contains("\"errcode\":0"))
{
throw new Exception("设置代发失败!请确认商品已加入" + targetSupplierName + "代发!" + BaseRegex.GetStringJson(ref apiAddDropship, "msg"));
@@ -1786,7 +1786,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
try
{
var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(orderItem.Shop, orderItem.ItemOrder);
var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(orderItem.ItemOrder.Shop, orderItem.ItemOrder);
if (rst == "success")
{
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
@@ -1938,7 +1938,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
if (this.DataContext is oms_wei_order_item_info orderItem)
{
WXOrderListOptimizeForm form = new WXOrderListOptimizeForm(orderItem.Shop);
WXOrderListOptimizeForm form = new WXOrderListOptimizeForm(orderItem.ItemOrder.Shop);
form.lblOrderId.Text = orderItem.order_id;
form.lblSpuId.Text = orderItem.product_id;
form.lblSkuId.Text = orderItem.sku_id; // skuId