优化读单
This commit is contained in:
1 parent
171064f03f
commit
5e453e2927
10 files changed
+566
-402
No files matched your search
@@ -62,6 +62,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
private static readonly object locker = new object();
|
||||
public static bool IsAutoBuy { get; set; } = false;
|
||||
public static DateTime LastGetOrderTime { get; set; } = DateTime.MinValue;
|
||||
|
||||
public bool _isReadFullOrder = true;
|
||||
/// <summary> 全量读取订单 </summary>
|
||||
public bool isReadFullOrder
|
||||
{
|
||||
get { return _isReadFullOrder; }
|
||||
set
|
||||
{
|
||||
if (_isReadFullOrder != value)
|
||||
_isReadFullOrder = value;
|
||||
OnPropertyChanged(new PropertyChangedEventArgs("isReadFullOrder"));
|
||||
}
|
||||
}
|
||||
|
||||
public CheckBox chkSelectAll = null;
|
||||
OrderFilterConfig _orderFilterConfig;
|
||||
public OrderFilterConfig orderFilterConfig
|
||||
@@ -331,8 +345,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary> 全量读取订单 </summary>
|
||||
public bool isReadFullOrder = true;
|
||||
public bool hasReadOrder = false;
|
||||
/// <summary>
|
||||
/// 批量拉取订单
|
||||
@@ -357,279 +369,74 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
if (isReadFullOrder || !string.IsNullOrEmpty(orderIds))
|
||||
{
|
||||
//isReadFullOrder = false;
|
||||
|
||||
bool hasGetPage = false;
|
||||
int page = 0;
|
||||
int totalPage = 1;
|
||||
int pageSize = 50;
|
||||
#if DEBUG
|
||||
pageSize = 200;
|
||||
#endif
|
||||
|
||||
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
||||
if (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds))
|
||||
{
|
||||
if (showReadOrderMsg)
|
||||
BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页" + (hasGetPage == false ? "" : ("/共" + totalPage + "页"));
|
||||
if (page >= totalPage)
|
||||
try
|
||||
{
|
||||
break;
|
||||
}
|
||||
await Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
imgLoading.Visibility = Visibility.Visible;
|
||||
btnSearch.IsEnabled = false;
|
||||
});
|
||||
var thisGetOrderTime = DateTime.Now.AddMinutes(-2);
|
||||
|
||||
page++;
|
||||
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
||||
var data = UserLogin.GetSignaturex() + "&page=" + page;
|
||||
if (!string.IsNullOrEmpty(orderIds))
|
||||
data += "&erp_order_id_in=" + orderIds;
|
||||
if (page > 1)
|
||||
data += "&is_not_count=true";
|
||||
data += "&page_size=" + pageSize;
|
||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
//指定订单id的查询,不再查询店铺id
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
await OrderGetOrderListHelper.GetWxOrderAsync(showReadOrderMsg, orderIds);
|
||||
await disPlayOrderTabOrderCountAsync();
|
||||
|
||||
// 按过滤条件读取 已废弃
|
||||
//if (filterGetCondition)
|
||||
//{
|
||||
// if (!string.IsNullOrEmpty(orderFilterConfig.txtFilterShopNameText))
|
||||
// {
|
||||
// var shopNames = orderFilterConfig.txtFilterShopNameText.Split(';').Where(s => !s.IsNullOrEmpty()).ToList();
|
||||
// shop_id = string.Join(",", GlobalConfig.ShopLoginList.Where(s => shopNames.Contains(s.ShopAccount)).Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
// }
|
||||
//}
|
||||
var startTime = BaseClass.DateTimeToTimestampSeconds(DateStart);
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(DateEnd.AddDays(1));
|
||||
if (!IsEndDate)
|
||||
endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(1));
|
||||
// 查询单一订单号订单,不按时间范围搜索
|
||||
if (string.IsNullOrEmpty(orderIds) || orderIds.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList().Count != 1)
|
||||
{
|
||||
data += "&start_time=" + startTime;
|
||||
data += "&end_time=" + endTime;
|
||||
}
|
||||
await Task.Delay(200);
|
||||
|
||||
var html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
|
||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||
if (totalCount > 0)
|
||||
{
|
||||
hasGetPage = true;
|
||||
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
|
||||
var seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
||||
|
||||
var jArr = JObject.Parse(html)["data"];
|
||||
if (jArr.Count() == 0)
|
||||
break;
|
||||
|
||||
var order_ids = string.Join(",", jArr.Select(a => a["order_id"].ParseToString()));
|
||||
|
||||
// 读取订单详情
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
await Task.Delay(100);
|
||||
List<oms_wei_order_item_info> orderItems = await OrderGetOrderListHelper.GetOrderItemInfo(order_ids);
|
||||
|
||||
// 读取售后单
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
await Task.Delay(100);
|
||||
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
|
||||
|
||||
// 读订单扩展
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
await Task.Delay(100);
|
||||
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
foreach (var oie in orderItemExts)
|
||||
// 第一次完整读单后设置为增量读单
|
||||
if (IsAutoReadOrder && string.IsNullOrEmpty(orderIds))
|
||||
{
|
||||
// 移除订单物流异常信息,每次批量读单最后要去微信获取
|
||||
// 改为后台模拟读取不存在则设置为 ""
|
||||
//oie.abnormal_text = "";
|
||||
isReadFullOrder = false;
|
||||
LastGetOrderTime = thisGetOrderTime;
|
||||
}
|
||||
}
|
||||
|
||||
// 读取中转仓拍单订单
|
||||
var transitOrderList = await OrderGetOrderListHelper.GetTransitWarehouseList(order_ids);
|
||||
|
||||
// 额外订单包裹补发
|
||||
var transitExtraPackageList = await OrderGetOrderListHelper.GetTransitExtraPackageList(order_ids);
|
||||
|
||||
// 读取中转仓拍单订单售后状态
|
||||
var transitAfterSaleList = await OrderGetOrderListHelper.GetTransitWarehouseAfterSaleList(order_ids);
|
||||
|
||||
// 读取分销退货(中转仓退货)订单
|
||||
var transitReturnOrderList = await OrderGetOrderListHelper.GetTransitReturnOrderList(order_ids);
|
||||
|
||||
// 读取暂时记录的买手订单,后面想办法放到中转订单库里去
|
||||
var pddBuyerOrders = await OrderGetOrderListHelper.GetPddBuyerOrders(order_ids);
|
||||
// 读取暂时记录的淘宝买手订单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
||||
pddBuyerOrders.AddRange(await OrderGetOrderListHelper.GetTbBuyerOrders(order_ids));
|
||||
|
||||
// 读取暂时记录的买手售后单,后面想办法放到中转订单库里去
|
||||
var pddBuyerAfterSales = await OrderGetOrderListHelper.GetPddBuyerAfterSales(order_ids);
|
||||
// 读取暂时记录的淘宝买手售后单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
||||
pddBuyerAfterSales.AddRange(await OrderGetOrderListHelper.GetTbBuyerAfterSales(order_ids));
|
||||
|
||||
// 同步单
|
||||
var buyerOrderIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
||||
var syncLogistics = await OrderGetOrderListHelper.GetSyncLogistics(buyerOrderIds);
|
||||
|
||||
// 读取关联拍单商品
|
||||
var buyMapList = await OrderGetOrderListHelper.GetBuyProdMap(orderItems);
|
||||
|
||||
// 读取关联拍单的所有sku
|
||||
var buyMapSkusList = await OrderGetOrderListHelper.GetBuyProdMapSkus(orderItems);
|
||||
|
||||
// 读取物流轨迹
|
||||
var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids);
|
||||
|
||||
var orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JsonHelper.SerializeObject(jArr));
|
||||
// 装载订单
|
||||
foreach (var order in orders)
|
||||
catch (Exception ex)
|
||||
{
|
||||
try
|
||||
{
|
||||
//装载订单商品详情
|
||||
order.OrderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
// 订单商品
|
||||
item.ItemOrder = order;
|
||||
order.OrderItems.Add(item);
|
||||
|
||||
item.OrderItemExt = orderItemExts.FirstOrDefault(ext => ext.order_id == item.order_id && item.sku_id == item.sku_id);
|
||||
|
||||
// 已放到赋值函数中处理
|
||||
// 更新店铺是否加入代发情况
|
||||
//item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == item.order_id);
|
||||
//Dispatcher.Invoke(new Action(() => { item.UpdateOrderItemBuyButton(); }));
|
||||
|
||||
// 关联拍单关系 // 危险物品禁止拍单,仅关联安全商品
|
||||
//if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
||||
{
|
||||
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.PddBuyMap == null)
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (item.PddBuyMap == null)
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.PddBuyMap == null)
|
||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
}
|
||||
item.PddBuyMapSkus = buyMapSkusList.Where(s => s.spu_code == item.out_product_id || s.spu_code == item.product_id).OrderByDescending(s => s.mdy_time)
|
||||
.Where(s => s.platform == "pdd").ToList();
|
||||
|
||||
{
|
||||
var tbBuyMapLst = buyMapList.Where(m => m.platform == "tb").ToList();
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.TbBuyMap == null)
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (item.TbBuyMap == null)
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.TbBuyMap == null)
|
||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
}
|
||||
item.TbBuyMapSkus = buyMapSkusList.Where(s => s.spu_code == item.out_product_id || s.spu_code == item.product_id).OrderByDescending(s => s.mdy_time)
|
||||
.Where(s => s.platform == "tb").ToList();
|
||||
|
||||
|
||||
// 中转仓订单
|
||||
if (item.ItemOrder.OrderItems.Count > 1)
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
else
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||
item.ItemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code || t.order_code == a.order_code)).ToList();
|
||||
item.DistribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();
|
||||
item.ItemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList();
|
||||
|
||||
// 中转仓买手订单(wx_send_type等于0)
|
||||
item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||
// 中转仓买手退货订单(wx_send_type等于0)
|
||||
item.PddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||
// 直发买手订单(wx_send_type等于1)
|
||||
item.DirectPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList();
|
||||
// 直发买手退款订单(wx_send_type等于1)
|
||||
item.DirectPddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList();
|
||||
}
|
||||
|
||||
// 装载订单售后详情
|
||||
order.RefundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
||||
|
||||
// 装载同步单
|
||||
order.SyncLogisticsList = [.. syncLogistics.Where(os => order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))),];
|
||||
|
||||
// 装载订单物流最后一条信息
|
||||
order.LatestEWaybills = [.. ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong())];
|
||||
|
||||
// 读取订单后立即赋值,防止滚动时实时赋值造成卡顿
|
||||
InitOrderObservableProp(order);
|
||||
|
||||
// 删除再添加,触发更新。 todo: 如果已存在相同订单,则直接修改更新
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
while (orderExist != null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Remove(orderExist);
|
||||
orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
await FilterOneOrder(order);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
BaseMsgWindow.ShowAnimateMessage("全量读取订单发生错误 " + ex.Message);
|
||||
}
|
||||
|
||||
if (page % 5 == 1 || page >= totalPage)
|
||||
await disPlayOrderTabOrderCount();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (LastGetOrderTime == DateTime.MinValue || LastGetOrderTime < DateStart)
|
||||
LastGetOrderTime = DateStart;
|
||||
await OrderGetOrderListHelper.GetWxOrderIncrementAsync(LastGetOrderTime);
|
||||
if (IsAutoReadOrder)
|
||||
{
|
||||
if (LastGetOrderTime == DateTime.MinValue || LastGetOrderTime < DateStart)
|
||||
LastGetOrderTime = DateStart;
|
||||
|
||||
try
|
||||
{
|
||||
var thisGetOrderTime = DateTime.Now.AddMinutes(-2);
|
||||
|
||||
await OrderGetOrderListHelper.GetWxOrderIncrementAsync(LastGetOrderTime);
|
||||
await disPlayOrderTabOrderCountAsync();
|
||||
|
||||
if (IsAutoReadOrder)
|
||||
LastGetOrderTime = thisGetOrderTime;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("增量读取订单发生错误 " + ex.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 处理店铺后台物流异常单
|
||||
if (showReadOrderMsg)
|
||||
BottomMsg = "当前正在读取物流异常单...";
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||
await GetShopWaybillExceptionOrder();
|
||||
|
||||
// 处理拒收单
|
||||
if (showReadOrderMsg)
|
||||
BottomMsg = "当前正在处理拒收单...";
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||
await AutoUpdateTransitRejectedToPddShop();
|
||||
|
||||
// 处理中转仓退货包裹
|
||||
if (showReadOrderMsg)
|
||||
BottomMsg = "当前正在处理拦截退回总店...";
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||
await AutoUpdateTransitPackageToPddShop();
|
||||
|
||||
// 处理退货仓分销退货
|
||||
if (showReadOrderMsg)
|
||||
BottomMsg = "当前正在处理分销退货...";
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||
{
|
||||
await DoReturnOrderBuyerRefendSlient();
|
||||
await DoReturnOrderTransitCreateSlient();
|
||||
@@ -796,7 +603,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
orderItem.OrderItemExt = orderExt;
|
||||
|
||||
InitOrderObservableProp(order);
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||
await MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -807,7 +614,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
if (index % 10 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1)
|
||||
await Task.Run(() => disPlayOrderTabOrderCount());
|
||||
await Task.Run(() => disPlayOrderTabOrderCountAsync());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1090,7 +897,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
|
||||
public async Task disPlayOrderTabOrderCount()
|
||||
public async Task disPlayOrderTabOrderCountAsync()
|
||||
{
|
||||
//var orders = string.Join("','", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
||||
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
||||
@@ -1195,7 +1002,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
}));
|
||||
|
||||
await disPlayOrderTabOrderCount();
|
||||
await disPlayOrderTabOrderCountAsync();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -1270,7 +1077,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
if (updateTabCount)
|
||||
{
|
||||
await disPlayOrderTabOrderCount();
|
||||
await disPlayOrderTabOrderCountAsync();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user