增量读取订单功能 90% 新的二级oem 50%

This commit is contained in:
wule committed 2026-11-17 16:43:47 +08:00
1 parent e3f4e34def
commit 171064f03f
31 files changed
+1169 -624

No files matched your search

@@ -675,9 +675,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// 处理这些获取到的微信订单
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
foreach (var orderItem in order.OrderItems)
{
if (orderItem.ItemOrder.orderItems.Count > 1)
if (orderItem.ItemOrder.OrderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -708,7 +708,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (wxOrder != null)
{
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 "";
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
if (wxOrderItem != null)
{
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -729,7 +729,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null)
{
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
}
@@ -1019,9 +1019,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
foreach (var orderItem in order.OrderItems)
{
if (orderItem.ItemOrder.orderItems.Count > 1)
if (orderItem.ItemOrder.OrderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1057,7 +1057,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
if (wxOrder != null)
{
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
if (wxOrderItem != null)
{
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -1071,7 +1071,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transitItem != null)
{
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no);
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
buyerAfterSale = buyerAfterSales.FirstOrDefault(ba => ba.orderSn == transitItem.out_order_no && !ba.afterSaleAddress.IsNullOrEmpty());
//refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
@@ -1773,10 +1773,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
foreach (var orderItem in order.OrderItems)
{
// 中转仓订单
if (orderItem.ItemOrder.orderItems.Count > 1)
if (orderItem.ItemOrder.OrderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1792,7 +1792,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null)
{
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no);
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
var order_item = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
@@ -1924,10 +1924,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "取号成功";
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
if (shopOrder != null)
{
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
if (orderItem != null)
{
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -1980,10 +1980,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
order.sendStatus = "修改提前取号成功";
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
if (shopOrder != null)
{
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
if (orderItem != null)
{
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -2281,7 +2281,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
if (mainOrder != null)
{
var orderItem = mainOrder.orderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
var orderItem = mainOrder.OrderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
if (orderItem != null)
orderItem.SyncLogisticsMsg = ex.Message;
}