增量读取订单功能 90% 新的二级oem 50%
This commit is contained in:
1 parent
e3f4e34def
commit
171064f03f
31 files changed
+1169
-624
No files matched your search
@@ -6,10 +6,15 @@ using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Security.Policy;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Threading;
|
||||
using Work;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
@@ -29,23 +34,434 @@ public class OrderGetOrderListHelper
|
||||
var shopIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var shopIds = string.Join(",", shopIdList);
|
||||
|
||||
var existOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var updateOrderList = await GetOrderInfoBase(null, 0, shopIds, lastUpdateTime);
|
||||
var updateOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var orderIdList = existOrderIdList;
|
||||
orderIdList.AddRange(updateOrderIdList);
|
||||
orderIdList = orderIdList.Distinct().ToList();
|
||||
int pageCount = 1;
|
||||
List<oms_wei_order_info> upadtaOrderList = new List<oms_wei_order_info>();
|
||||
var beginDatetime = lastUpdateTime;
|
||||
var endDateTime = DateTime.Now;
|
||||
lastUpdateTime = endDateTime.AddSeconds(-30);
|
||||
for (int page = 1; page <= pageCount; page++)
|
||||
{
|
||||
var erpOrderInfo = await GetOrderInfoBase(null, shopIds, beginDatetime, endDateTime, page, 100, page == 1);
|
||||
|
||||
if (page == 1)
|
||||
pageCount = erpOrderInfo.PageCount;
|
||||
|
||||
// 遇到相同订单就更新状态,否则就新增一条数据
|
||||
foreach (var order in erpOrderInfo.OrderList)
|
||||
{
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist == null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
}
|
||||
else
|
||||
{
|
||||
orderExist.shop_id = order.shop_id;
|
||||
orderExist.shop_name = order.shop_name;
|
||||
orderExist.merchant_id = order.merchant_id;
|
||||
orderExist.order_id = order.order_id;
|
||||
orderExist.openid = order.openid;
|
||||
orderExist.create_time = order.create_time;
|
||||
orderExist.update_time = order.update_time;
|
||||
orderExist.unionid = order.unionid;
|
||||
orderExist.status = order.status;
|
||||
orderExist.aftersale_detail = order.aftersale_detail;
|
||||
orderExist.pay_info = order.pay_info;
|
||||
orderExist.ext_info = order.ext_info;
|
||||
orderExist.product_price = order.product_price;
|
||||
orderExist.order_price = order.order_price;
|
||||
orderExist.purchase_price = order.purchase_price;
|
||||
orderExist.purchase_time = order.purchase_time;
|
||||
orderExist.freight = order.freight;
|
||||
orderExist.predict_commission_fee = order.predict_commission_fee;
|
||||
orderExist.commission_amount = order.commission_amount;
|
||||
orderExist.discounted_price = order.discounted_price;
|
||||
orderExist.profit = order.profit;
|
||||
orderExist.purchase_status = order.purchase_status;
|
||||
orderExist.delivery_deadline = order.delivery_deadline;
|
||||
orderExist.delivery_time = order.delivery_time;
|
||||
orderExist.user_name = order.user_name;
|
||||
orderExist.postal_code = order.postal_code;
|
||||
orderExist.province_name = order.province_name;
|
||||
orderExist.city_name = order.city_name;
|
||||
orderExist.county_name = order.county_name;
|
||||
orderExist.detail_info = order.detail_info;
|
||||
orderExist.tel_number = order.tel_number;
|
||||
orderExist.house_number = order.house_number;
|
||||
orderExist.virtual_order_tel_number = order.virtual_order_tel_number;
|
||||
orderExist.tel_number_ext_info = order.tel_number_ext_info;
|
||||
orderExist.use_tel_number = order.use_tel_number;
|
||||
orderExist.hash_code = order.hash_code;
|
||||
orderExist.delivery_product_info = order.delivery_product_info;
|
||||
orderExist.ship_done_time = order.ship_done_time;
|
||||
orderExist.ewaybill_order_code = order.ewaybill_order_code;
|
||||
orderExist.settle_info = order.settle_info;
|
||||
orderExist.audit_status = order.audit_status;
|
||||
orderExist.audit_time = order.audit_time;
|
||||
orderExist.erp_send_company = order.erp_send_company;
|
||||
orderExist.erp_send_code = order.erp_send_code;
|
||||
orderExist.erp_send_status = order.erp_send_status;
|
||||
orderExist.erp_send_time = order.erp_send_time;
|
||||
orderExist.colour_flag = order.colour_flag;
|
||||
orderExist.colour_flag_update_time = order.colour_flag_update_time;
|
||||
orderExist.supplier_remark_exception = order.supplier_remark_exception;
|
||||
orderExist.gift_order_status = order.gift_order_status;
|
||||
orderExist.shop_remark = order.shop_remark;
|
||||
orderExist.soft_remark = order.soft_remark;
|
||||
orderExist.out_amount = order.out_amount;
|
||||
orderExist.out_account = order.out_account;
|
||||
orderExist.out_order_no = order.out_order_no;
|
||||
orderExist.out_express_company = order.out_express_company;
|
||||
orderExist.out_express_no = order.out_express_no;
|
||||
orderExist.out_shipped = order.out_shipped;
|
||||
orderExist.is_shipment_optimized = order.is_shipment_optimized;
|
||||
orderExist.is_express_no_used = order.is_express_no_used;
|
||||
orderExist.out_after_sale_status = order.out_after_sale_status;
|
||||
orderExist.has_freight_insurance = order.has_freight_insurance;
|
||||
orderExist.freight_insurance_amount = order.freight_insurance_amount;
|
||||
orderExist.external_gift = order.external_gift;
|
||||
orderExist.transfer_warehouse_status = order.transfer_warehouse_status;
|
||||
orderExist.postage_price = order.postage_price;
|
||||
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
var itemExist = orderExist.OrderItems.FirstOrDefault(oi => oi.sku_id == item.sku_id);
|
||||
if (itemExist == null)
|
||||
orderExist.OrderItems.Add(item);
|
||||
else
|
||||
{
|
||||
itemExist.merchant_id = item.merchant_id;
|
||||
itemExist.order_id = item.order_id;
|
||||
itemExist.product_id = item.product_id;
|
||||
itemExist.sku_id = item.sku_id;
|
||||
itemExist.thumb_img = item.thumb_img;
|
||||
itemExist.sku_cnt = item.sku_cnt;
|
||||
itemExist.sale_price = item.sale_price;
|
||||
itemExist.title = item.title;
|
||||
itemExist.on_aftersale_sku_cnt = item.on_aftersale_sku_cnt;
|
||||
itemExist.finish_aftersale_sku_cnt = item.finish_aftersale_sku_cnt;
|
||||
itemExist.sku_code = item.sku_code;
|
||||
itemExist.market_price = item.market_price;
|
||||
itemExist.sku_attrs = item.sku_attrs;
|
||||
itemExist.real_price = item.real_price;
|
||||
itemExist.out_product_id = item.out_product_id;
|
||||
itemExist.purchase_price = item.purchase_price;
|
||||
itemExist.freight = item.freight;
|
||||
itemExist.out_sku_id = item.out_sku_id;
|
||||
itemExist.is_discounted = item.is_discounted;
|
||||
itemExist.estimate_price = item.estimate_price;
|
||||
itemExist.is_change_price = item.is_change_price;
|
||||
itemExist.change_price = item.change_price;
|
||||
itemExist.cash_coupon_discounted_price = item.cash_coupon_discounted_price;
|
||||
itemExist.out_warehouse_id = item.out_warehouse_id;
|
||||
itemExist.return_address = item.return_address;
|
||||
itemExist.sku_deliver_info = item.sku_deliver_info;
|
||||
itemExist.extra_service = item.extra_service;
|
||||
itemExist.use_deduction = item.use_deduction;
|
||||
itemExist.deduction_price = item.deduction_price;
|
||||
itemExist.predict_commission_fee = item.predict_commission_fee;
|
||||
itemExist.commission_amount = item.commission_amount;
|
||||
itemExist.order_product_coupon_info_list = item.order_product_coupon_info_list;
|
||||
itemExist.erp_goods_id = item.erp_goods_id;
|
||||
itemExist.erp_goods_sku_id = item.erp_goods_sku_id;
|
||||
itemExist.refund_status = item.refund_status;
|
||||
itemExist.predict_commission_fee = item.predict_commission_fee;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//var existOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
//var updateOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
//var orderIdList = existOrderIdList;
|
||||
//orderIdList.AddRange(updateOrderIdList);
|
||||
var orderIdList = GlobalConfig.lstOrder.ToList().Select(o => o.order_id).Distinct().ToList();
|
||||
|
||||
while(orderIdList.Count > 0 )
|
||||
{
|
||||
var orderIdTake = orderIdList.Take(500).ToList();
|
||||
var orderIdTake = orderIdList.Take(200).ToList();
|
||||
orderIdList.RemoveAll(o => orderIdTake.Contains(o));
|
||||
|
||||
var orderIds = string.Join(",", orderIdTake);
|
||||
|
||||
var order_ids = string.Join(",", orderIdTake);
|
||||
var orders = GlobalConfig.lstOrder.Where(o => orderIdTake.Contains(o.order_id)).ToList();
|
||||
|
||||
await Task.Delay(200);
|
||||
|
||||
// 读取售后单
|
||||
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
|
||||
|
||||
// 读订单扩展
|
||||
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
|
||||
|
||||
// 读取中转仓拍单订单
|
||||
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 orderItemsTmp = new List<oms_wei_order_item_info>();
|
||||
foreach (var o in orders) { orderItemsTmp.AddRange(o.OrderItems.ToList()); }
|
||||
// 读取关联拍单商品
|
||||
var buyMapList = await OrderGetOrderListHelper.GetBuyProdMap(orderItemsTmp);
|
||||
// 读取关联拍单的所有sku
|
||||
var buyMapSkusList = await OrderGetOrderListHelper.GetBuyProdMapSkus(orderItemsTmp);
|
||||
|
||||
// 读取物流轨迹
|
||||
var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids);
|
||||
|
||||
// 装载订单
|
||||
foreach (var order in orders)
|
||||
{
|
||||
try
|
||||
{
|
||||
//装载订单商品详情
|
||||
//order.OrderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||
var orderItems = order.OrderItems;
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
// 订单商品
|
||||
//item.ItemOrder = order;
|
||||
//order.OrderItems.Add(item);
|
||||
|
||||
// 扩展订单信息
|
||||
if (orderItemExts.FirstOrDefault(ext => ext.order_id == item.order_id && item.sku_id == item.sku_id) is order_item_ext ext)
|
||||
item.OrderItemExt = ext;
|
||||
|
||||
// 关联拍单关系 拼多多 // 危险物品禁止拍单,仅关联安全商品
|
||||
//if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
||||
{
|
||||
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
|
||||
var pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (pddBuyMap == null)
|
||||
pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (pddBuyMap == null)
|
||||
pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (pddBuyMap == null)
|
||||
pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
if (pddBuyMap != null)
|
||||
item.PddBuyMap = pddBuyMap;
|
||||
}
|
||||
if (item.PddBuyMapSkus == null)
|
||||
item.PddBuyMapSkus = new List<WXBuyMapSkusInfo>();
|
||||
var 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();
|
||||
if (pddBuyMapSkus.Count > 0)
|
||||
{
|
||||
pddBuyMapSkus.AddRange(item.PddBuyMapSkus.ToList().Where(ims => !pddBuyMapSkus.Any(ms => ms.spu_code == ims.spu_code)));
|
||||
item.PddBuyMapSkus = pddBuyMapSkus.OrderByDescending(s => s.mdy_time).ToList();
|
||||
}
|
||||
|
||||
// 关联拍单关系 淘宝
|
||||
{
|
||||
var tbBuyMapLst = buyMapList.Where(m => m.platform == "tb").ToList();
|
||||
var tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (tbBuyMap == null)
|
||||
tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (tbBuyMap == null)
|
||||
tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (tbBuyMap == null)
|
||||
tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
if (tbBuyMap != null)
|
||||
item.TbBuyMap = tbBuyMap;
|
||||
}
|
||||
if (item.TbBuyMapSkus == null)
|
||||
item.TbBuyMapSkus = new List<WXBuyMapSkusInfo>();
|
||||
var 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 (tbBuyMapSkus.Count > 0)
|
||||
{
|
||||
tbBuyMapSkus.AddRange(item.TbBuyMapSkus.ToList().Where(ims => !tbBuyMapSkus.Any(ms => ms.spu_code == ims.spu_code)));
|
||||
item.TbBuyMapSkus = tbBuyMapSkus;
|
||||
}
|
||||
|
||||
// 中转仓订单
|
||||
if (item.ItemTransitOrders == null)
|
||||
item.ItemTransitOrders = new List<oms_wei_external_procurement_log_info>();
|
||||
var itemTransitOrders = transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id).ToList();
|
||||
if (itemTransitOrders.Count > 0)
|
||||
{
|
||||
itemTransitOrders.AddRange(item.ItemTransitOrders.ToList().Where(ito => !itemTransitOrders.Any(to => to.order_no == ito.order_no && to.order_sku_id == ito.order_sku_id)));
|
||||
item.ItemTransitOrders = itemTransitOrders.OrderByDescending(ito => ito.id).ToList();
|
||||
}
|
||||
// 中转仓售后单
|
||||
if (item.ItemTransitOrderAfterSales == null)
|
||||
item.ItemTransitOrderAfterSales = new List<oms_wei_external_procurement_after_sale_info>();
|
||||
var itemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code || t.order_code == a.order_code)).ToList();
|
||||
if (itemTransitOrderAfterSales.Count > 0)
|
||||
{
|
||||
transitAfterSaleList.AddRange(item.ItemTransitOrderAfterSales.ToList().Where(iaf => !itemTransitOrderAfterSales.Any(af => af.order_code == iaf.order_code)));
|
||||
item.ItemTransitOrderAfterSales = transitAfterSaleList.OrderByDescending(iaf => iaf.id).ToList();
|
||||
}
|
||||
// 中转仓额外单
|
||||
if (item.ItemTransitExtraOrders == null)
|
||||
item.ItemTransitExtraOrders = new List<oms_wei_transfer_extra_package>();
|
||||
var itemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList();
|
||||
if (itemTransitExtraOrders.Count > 0)
|
||||
{
|
||||
itemTransitExtraOrders.AddRange(item.ItemTransitExtraOrders.ToList().Where(ite => !itemTransitExtraOrders.Any(te => te.order_code == ite.order_code)));
|
||||
item.ItemTransitExtraOrders = itemTransitExtraOrders.OrderByDescending(ite => ite.id).ToList();
|
||||
}
|
||||
// 分销退货包裹
|
||||
if (item.DistribReturnOrderInfos == null)
|
||||
item.DistribReturnOrderInfos = new List<distrib_return_order_info>();
|
||||
var distribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();
|
||||
if (distribReturnOrderInfos.Count > 0)
|
||||
{
|
||||
distribReturnOrderInfos.AddRange(item.DistribReturnOrderInfos.ToList().Where(iro => !distribReturnOrderInfos.Any(ro => ro.order_code_source == iro.order_code_source)));
|
||||
item.DistribReturnOrderInfos = distribReturnOrderInfos.OrderByDescending(itr => itr.id).ToList();
|
||||
}
|
||||
|
||||
// 中转仓买手订单(wx_send_type等于0)
|
||||
if (item.PddBuyerOrders == null)
|
||||
item.PddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||
var transitPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||
if (transitPddBuyerOrders.Count > 0)
|
||||
{
|
||||
transitPddBuyerOrders.AddRange(item.PddBuyerOrders.ToList().Where(ioo => !transitPddBuyerOrders.Any(oo => oo.order_sn == ioo.order_sn)));
|
||||
item.PddBuyerOrders = transitPddBuyerOrders.OrderByDescending(ioo => ioo.add_time).ToList();
|
||||
}
|
||||
// 中转仓买手退货订单(wx_send_type等于0)
|
||||
if (item.PddBuyerAfterSales == null)
|
||||
item.PddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||
var transitPddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||
if (transitPddBuyerAfterSales.Count > 0)
|
||||
{
|
||||
transitPddBuyerAfterSales.AddRange(item.PddBuyerAfterSales.Where(iaf => !transitPddBuyerAfterSales.Any(af => af.orderSn == iaf.orderSn)));
|
||||
item.PddBuyerAfterSales = transitPddBuyerAfterSales.OrderByDescending(iaf => iaf.id).ToList();
|
||||
}
|
||||
// 直发买手订单(wx_send_type等于1)
|
||||
if (item.DirectPddBuyerOrders == null)
|
||||
item.DirectPddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||
var directPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList();
|
||||
if (directPddBuyerOrders.Count > 0)
|
||||
{
|
||||
directPddBuyerOrders.AddRange(item.DirectPddBuyerOrders.ToList().Where(ioo => !transitPddBuyerOrders.Any(oo => oo.order_sn == ioo.order_sn)));
|
||||
item.DirectPddBuyerOrders = directPddBuyerOrders.OrderByDescending(ioo => ioo.add_time).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())];
|
||||
|
||||
// 读取订单后立即赋值,防止滚动时实时赋值造成卡顿
|
||||
OrderListCtrl.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 FilterIncrementOrder(order);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static async Task FilterIncrementOrder(oms_wei_order_info order, bool updateTabCount = false)
|
||||
{
|
||||
if (order == null)
|
||||
return;
|
||||
|
||||
oms_wei_order_info orderExist = null;
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
|
||||
if (!MainWindow.Instance.orderListCtrl.GetOrderIsFilter(order))
|
||||
{
|
||||
if (orderExist == null)
|
||||
{
|
||||
var index = -1;
|
||||
oms_wei_order_info nextOrder = null;
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.update_time < order.update_time);
|
||||
else
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
|
||||
|
||||
if (nextOrder != null)
|
||||
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
|
||||
}
|
||||
await MainWindow.Instance.orderListCtrl.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Insert(index, order);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
Thread.Sleep(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
while (orderExist != null)
|
||||
{
|
||||
await MainWindow.Instance.orderListCtrl.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(orderExist);
|
||||
}
|
||||
});
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
}
|
||||
Thread.Sleep(1);
|
||||
}
|
||||
|
||||
|
||||
if (updateTabCount)
|
||||
{
|
||||
await MainWindow.Instance.orderListCtrl.disPlayOrderTabOrderCount();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -55,7 +471,13 @@ public class OrderGetOrderListHelper
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
|
||||
{
|
||||
return await GetOrderInfoBase(order_ids);
|
||||
return (await GetOrderInfoBase(order_ids)).OrderList;
|
||||
}
|
||||
|
||||
public class ErpOrderInfo
|
||||
{
|
||||
public int PageCount { get; set; } = 0;
|
||||
public List<oms_wei_order_info> OrderList { get; set; } = new List<oms_wei_order_info> { };
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -63,10 +485,11 @@ public class OrderGetOrderListHelper
|
||||
/// </summary>
|
||||
/// <param name="orderIds"></param>
|
||||
/// <returns></returns>
|
||||
static async Task<List<oms_wei_order_info>> GetOrderInfoBase(string orderIds, int pageSize = 100, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null)
|
||||
static async Task<ErpOrderInfo> GetOrderInfoBase(string orderIds, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null,
|
||||
int page = 1, int pageSize = 100, bool isGetCount = false)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
return new List<oms_wei_order_info>();
|
||||
if (string.IsNullOrEmpty(orderIds) && string.IsNullOrEmpty(shopIds))
|
||||
return new ErpOrderInfo();
|
||||
|
||||
Thread.Sleep(100);
|
||||
try
|
||||
@@ -75,6 +498,9 @@ public class OrderGetOrderListHelper
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&erp_order_id_in=" + orderIds;
|
||||
data += "&page_size=" + pageSize;
|
||||
data += "&page=" + page;
|
||||
if (isGetCount == false)
|
||||
data += "&is_not_count=true";
|
||||
if (!string.IsNullOrWhiteSpace(shopIds))
|
||||
data += "&erp_shop_id_in=" + shopIds;
|
||||
if (beginUpdateTime != null && beginUpdateTime != DateTime.MinValue)
|
||||
@@ -99,19 +525,30 @@ public class OrderGetOrderListHelper
|
||||
if (orders == null)
|
||||
orders = new List<oms_wei_order_info>();
|
||||
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
orderIds = string.Join(",", orders.Select(o => o.order_id));
|
||||
var orderItems = await GetOrderItemInfo(orderIds);
|
||||
foreach (var orderItem in orderItems)
|
||||
//foreach (var orderItem in orderItems)
|
||||
//{
|
||||
// var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
// orderItem.ItemOrder = order;
|
||||
// order.OrderItems.Add(orderItem);
|
||||
//}
|
||||
foreach (var order in orders)
|
||||
{
|
||||
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
orderItem.ItemOrder = order;
|
||||
order.orderItems.Add(orderItem);
|
||||
order.OrderItems = new ObservableCollection<oms_wei_order_item_info>(orderItems.Where(ois => ois.order_id == order.order_id));
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
orderItem.ItemOrder = order;
|
||||
}
|
||||
}
|
||||
return orders;
|
||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||
return new ErpOrderInfo() { OrderList = orders, PageCount = (totalCount > 0) ? Math.Ceiling(1m * totalCount / pageSize).ParseToInt() : -1 };
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
return new List<oms_wei_order_info>();
|
||||
return new ErpOrderInfo();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,9 +594,9 @@ public class OrderGetOrderListHelper
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_refund_info>();
|
||||
Thread.Sleep(100);
|
||||
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
|
||||
var data2 = UserLogin.GetSignaturex();
|
||||
data2 += "&erp_order_id_in=" + order_ids;
|
||||
@@ -183,6 +620,7 @@ public class OrderGetOrderListHelper
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
|
||||
if (!string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
@@ -544,4 +982,91 @@ public class OrderGetOrderListHelper
|
||||
}
|
||||
return new List<oms_wei_ewaybill_path>();
|
||||
}
|
||||
|
||||
public static async Task<List<WXBuyMapInfo>> GetBuyProdMap(List<oms_wei_order_item_info> orderItems)
|
||||
{
|
||||
//foreach (var item in orderItems.ToList())
|
||||
//{
|
||||
// var buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
|
||||
// if (buyMap != null)
|
||||
// orderItems.Remove(item);
|
||||
//}
|
||||
if (orderItems == null || orderItems.Count == 0)
|
||||
{
|
||||
return new List<WXBuyMapInfo>();
|
||||
}
|
||||
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id)).Distinct()) + "," +
|
||||
string.Join(",", orderItems.Select(oi => oi.product_id).Distinct());
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = await GetHtml.PostUtf8Async(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
resultMap = await GetHtml.PostUtf8Async(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单关联读取失败 " + BaseRegex.GetStringJson(ref resultMap, "msg"), "Error", 5);
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
var buyMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString());
|
||||
buyMapList = buyMapList.Where(b => !GlobalConfig.BuyMapList.Any(m => m.sku_code == b.sku_code && m.spu_code == b.spu_code)).ToList();
|
||||
GlobalConfig.BuyMapList.AddRange(buyMapList);
|
||||
if (buyMapList.Count > 0)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<WXBuyMapInfo>();
|
||||
}
|
||||
}
|
||||
return GlobalConfig.BuyMapList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
|
||||
public static async Task<List<WXBuyMapSkusInfo>> GetBuyProdMapSkus(List<oms_wei_order_item_info> orderItems)
|
||||
{
|
||||
var ois = orderItems?.Where(oi => !GlobalConfig.BuyMapSkusList.Any(bm => bm.spu_code == oi.out_product_id || bm.spu_code == oi.product_id)).ToList();
|
||||
if (ois == null || ois.Count == 0)
|
||||
{
|
||||
return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_buy_pord_map_skus");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", ois.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id)).Distinct()) + "," + string.Join(",", ois.Select(oi => oi.product_id).Distinct());
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultSkusMap = await GetHtml.PostUtf8Async(url, dataMap);
|
||||
if (string.IsNullOrEmpty(resultSkusMap) || !resultSkusMap.Contains("\"code\":200"))
|
||||
{
|
||||
resultSkusMap = await GetHtml.PostUtf8Async(url, dataMap);
|
||||
}
|
||||
if (string.IsNullOrEmpty(resultSkusMap) || !resultSkusMap.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单关联列表读取失败 " + BaseRegex.GetStringJson(ref resultSkusMap, "msg"), "Error", 5);
|
||||
return new List<WXBuyMapSkusInfo>();
|
||||
}
|
||||
try
|
||||
{
|
||||
var buyMapSkusList = JsonHelper.DeserializeJsonToList<WXBuyMapSkusInfo>(JObject.Parse(resultSkusMap)["data"].ParseToString());
|
||||
buyMapSkusList = buyMapSkusList.Where(b => !GlobalConfig.BuyMapSkusList.Any(m => m.map_goods_id == b.map_goods_id)).ToList();
|
||||
GlobalConfig.BuyMapSkusList.AddRange(buyMapSkusList);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<WXBuyMapSkusInfo>();
|
||||
}
|
||||
return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user