diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs index 2b80bd3..377e42c 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs @@ -748,9 +748,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)); @@ -776,7 +776,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; @@ -797,7 +797,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); } @@ -1087,9 +1087,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)); @@ -1125,7 +1125,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; @@ -1139,7 +1139,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; @@ -2207,10 +2207,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)); @@ -2226,7 +2226,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); @@ -2361,10 +2361,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); @@ -2417,10 +2417,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); @@ -2727,7 +2727,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; } diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs index 2a064f7..fd57d63 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs @@ -206,7 +206,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls foreach (var order in GlobalConfig.lstOrder) { //OrderListCtrl.InitOrderObservableProp(order); - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { orderItem.UpdateOrderItemBuyButton(); } @@ -220,7 +220,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls foreach (var order in GlobalConfig.lstOrder) { //OrderListCtrl.InitOrderObservableProp(order); - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { orderItem.UpdateOrderItemBuyButton(); } @@ -345,7 +345,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls foreach (var order in GlobalConfig.lstOrder) { //OrderListCtrl.InitOrderObservableProp(order); - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { await Task.Run(() => { @@ -364,7 +364,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls foreach (var order in GlobalConfig.lstOrder) { //OrderListCtrl.InitOrderObservableProp(order); - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { await Task.Run(() => { diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs index 6cca7b0..431ea56 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs @@ -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; } diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs index ba99759..6dd6821 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs @@ -346,7 +346,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls this.txtShopGoodsNameVal = orderItem.title; this.txtShopSpecNameVal = orderItem.SkuAttrStr; this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString(); - this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString(); + this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString(); if (!this.IsMappingGoods && orderItem.TbBuyMap != null) { @@ -926,7 +926,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls { if (order.IsWaitBuy) { - foreach (var item in order.orderItems) + foreach (var item in order.OrderItems) { if (item.out_product_id == upSpuCode || item.product_id == upSpuCode) { @@ -990,7 +990,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls { if (order.IsWaitBuy) { - foreach (var item in order.orderItems) + foreach (var item in order.OrderItems) { if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) || (item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) || @@ -1112,8 +1112,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; - body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); - body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); + body["parentOemId"] = BaseClass.ParentOemId; + body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString(); + body["oemId"] = BaseClass.OemId; + body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString(); + body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString(); } var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate"; var dataStr = JsonHelper.SerializeObject(body); diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs index e0d759a..04fcc56 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs @@ -347,7 +347,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls this.txtShopGoodsNameVal = orderItem.title; this.txtShopSpecNameVal = orderItem.SkuAttrStr; this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString(); - this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString(); + this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString(); if (!this.IsMappingGoods && orderItem.TbBuyMap != null) { @@ -1641,7 +1641,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls { if (order.IsWaitBuy) { - foreach (var item in order.orderItems) + foreach (var item in order.OrderItems) { if (item.out_product_id == upSpuCode || item.product_id == upSpuCode) { @@ -1705,7 +1705,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls { if (order.IsWaitBuy) { - foreach (var item in order.orderItems) + foreach (var item in order.OrderItems) { if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) || (item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) || @@ -1827,8 +1827,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; - body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); - body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); + body["parentOemId"] = BaseClass.ParentOemId; + body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString(); + body["oemId"] = BaseClass.OemId; + body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString(); + body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString(); } var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate"; var dataStr = JsonHelper.SerializeObject(body); diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs index 46a48c7..598fbed 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs @@ -715,9 +715,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)); @@ -748,7 +748,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; @@ -769,7 +769,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); } @@ -1060,9 +1060,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)); @@ -1099,7 +1099,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; @@ -1113,7 +1113,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; @@ -1630,10 +1630,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)); @@ -1649,7 +1649,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); @@ -1786,10 +1786,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); @@ -1842,10 +1842,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); @@ -2143,7 +2143,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; } diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs index 2085fee..9ccb14f 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs @@ -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 upadtaOrderList = new List(); + 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 refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids); + + // 读订单扩展 + List 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(); + 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(); + 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(); + 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(); + 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(); + 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(); + 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(); + 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(); + 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(); + 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(); + 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(); + 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(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(); + } } /// @@ -55,7 +471,13 @@ public class OrderGetOrderListHelper /// public static async Task> 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 OrderList { get; set; } = new List { }; } /// @@ -63,10 +485,11 @@ public class OrderGetOrderListHelper /// /// /// - static async Task> GetOrderInfoBase(string orderIds, int pageSize = 100, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null) + static async Task 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(); + 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(); + 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(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(); + return new ErpOrderInfo(); } } @@ -157,9 +594,9 @@ public class OrderGetOrderListHelper /// public static async Task> GetOrderRefundInfo(string order_ids) { + Thread.Sleep(100); if (string.IsNullOrEmpty(order_ids)) return new List(); - 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 /// public static async Task> GetOrderItemExts(string order_ids) { + Thread.Sleep(100); List existOrderExtList = new List(); if (!string.IsNullOrEmpty(order_ids)) { @@ -544,4 +982,91 @@ public class OrderGetOrderListHelper } return new List(); } + + public static async Task> GetBuyProdMap(List 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(); + } + + 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(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(); + } + } + 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> GetBuyProdMapSkus(List 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(); + } + try + { + var buyMapSkusList = JsonHelper.DeserializeJsonToList(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(); + } + return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList(); + } } diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs index 561eb25..363ad6f 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs @@ -83,7 +83,7 @@ public partial class OrderListCtrl { sucessCount++; item.gift_order_status = 1; - foreach (var orderItem in item.orderItems) + foreach (var orderItem in item.OrderItems) { InitOrderItemObservableProp(orderItem); } @@ -109,7 +109,7 @@ public partial class OrderListCtrl } SetProgress(index, count); - BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}"; + BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}"; index++; } @@ -166,7 +166,7 @@ public partial class OrderListCtrl { errorCount++; } - BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}"; + BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}"; index++; } BottomMsg = $"订单同步进度完成 成功:{sucessCount} 失败:{errorCount} 总数:{count}"; @@ -203,7 +203,7 @@ public partial class OrderListCtrl { long shopid = item.Key; string shopName = item.Value.FirstOrDefault()?.shop_name ?? ""; - string[] afterSaleOrderIds = item.Value.SelectMany(a => a.refundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray(); + string[] afterSaleOrderIds = item.Value.SelectMany(a => a.RefundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray(); var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(shopid, afterSaleOrderIds); if (ret) { diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 791f5a9..ec10573 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -61,7 +61,7 @@ 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.Now; + public static DateTime LastGetOrderTime { get; set; } = DateTime.MinValue; public CheckBox chkSelectAll = null; OrderFilterConfig _orderFilterConfig; public OrderFilterConfig orderFilterConfig @@ -331,7 +331,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls }); } - + /// 全量读取订单 + public bool isReadFullOrder = true; public bool hasReadOrder = false; /// /// 批量拉取订单 @@ -353,257 +354,258 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls imgLoading.Visibility = Visibility.Visible; btnSearch.IsEnabled = false; })); - bool hasGetPage = false; - int page = 0; - int totalPage = 1; - int pageSize = 50; + + if (isReadFullOrder || !string.IsNullOrEmpty(orderIds)) + { + //isReadFullOrder = false; + + bool hasGetPage = false; + int page = 0; + int totalPage = 1; + int pageSize = 50; #if DEBUG - pageSize = 200; + pageSize = 200; #endif - while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds))) + while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds))) + { + if (showReadOrderMsg) + BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页" + (hasGetPage == false ? "" : ("/共" + totalPage + "页")); + if (page >= totalPage) + { + break; + } + await Dispatcher.InvokeAsync(() => + { + imgLoading.Visibility = Visibility.Visible; + btnSearch.IsEnabled = false; + }); + + 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; + + // 按过滤条件读取 已废弃 + //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 orderItems = await OrderGetOrderListHelper.GetOrderItemInfo(order_ids); + + // 读取售后单 + if (string.IsNullOrEmpty(order_ids)) + await Task.Delay(100); + List refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids); + + // 读订单扩展 + if (string.IsNullOrEmpty(order_ids)) + await Task.Delay(100); + List orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids); + if (string.IsNullOrEmpty(order_ids)) + { + foreach (var oie in orderItemExts) + { + // 移除订单物流异常信息,每次批量读单最后要去微信获取 + // 改为后台模拟读取不存在则设置为 "" + //oie.abnormal_text = ""; + } + } + + // 读取中转仓拍单订单 + 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(JsonHelper.SerializeObject(jArr)); + // 装载订单 + foreach (var order in orders) + { + try + { + //装载订单商品详情 + order.OrderItems = new ObservableCollection(); + 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(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) + { + } + } + + if (page % 5 == 1 || page >= totalPage) + await disPlayOrderTabOrderCount(); + } + } + else { - if (showReadOrderMsg) - BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页" + (hasGetPage == false ? "" : ("/共" + totalPage + "页")); - if (page >= totalPage) - { - break; - } - await Dispatcher.InvokeAsync(() => - { - imgLoading.Visibility = Visibility.Visible; - btnSearch.IsEnabled = false; - }); - - 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; - - // 按过滤条件读取 已废弃 - //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 - { - } - - if (html.Contains("3738686976228742912")) - { - } - 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 orderItems = await OrderGetOrderListHelper.GetOrderItemInfo(order_ids); - - // 读取售后单 - if (string.IsNullOrEmpty(order_ids)) - await Task.Delay(100); - List refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids); - - // 读订单扩展 - if (string.IsNullOrEmpty(order_ids)) - await Task.Delay(100); - List orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids); - if (string.IsNullOrEmpty(order_ids)) - { - foreach (var oie in orderItemExts) - { - // 移除订单物流异常信息,每次批量读单最后要去微信获取 - // 改为后台模拟读取不存在则设置为 "" - //oie.abnormal_text = ""; - } - } - - // 读取中转仓拍单订单 - 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 GetBuyProdMap(orderItems); - - // 读取关联拍单的所有sku - var buyMapSkusList = await GetBuyProdMapSkus(orderItems); - - // 读取物流轨迹 - var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids); - - // 装载订单 - foreach (JObject jObj in jArr) - { - try - { - oms_wei_order_info order = null; - order = JsonHelper.DeserializeJsonToObject(JsonHelper.SerializeObject(jObj)); - - //装载订单商品详情 - order.orderItems = new ObservableCollection(); - 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)); - // 中转仓退货包裹订单 - if (item.order_id == "3740137835668615168") - { - - } - 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(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) - { - } - } - - if (page % 5 == 1 || page >= totalPage) - await disPlayOrderTabOrderCount(); + if (LastGetOrderTime == DateTime.MinValue || LastGetOrderTime < DateStart) + LastGetOrderTime = DateStart; + await OrderGetOrderListHelper.GetWxOrder‌IncrementAsync(LastGetOrderTime); } // 处理店铺后台物流异常单 @@ -649,9 +651,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls public static void InitOrderObservableProp(oms_wei_order_info order) { - if (order != null && order.orderItems != null) + if (order != null && order.OrderItems != null) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { if (orderItem != null) orderItem.SetOrderItemTextProperty(); @@ -669,98 +671,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - - - - - - public static async Task> GetBuyProdMap(List 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 GlobalConfig.BuyMapList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList(); - } - - 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(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(); - } - } - 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> GetBuyProdMapSkus(List 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(); - } - try - { - var buyMapSkusList = JsonHelper.DeserializeJsonToList(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(); - } - return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList(); - } - public async Task GetShopWaybillExceptionOrder() { foreach (var shop in GlobalConfig.ShopLoginList) @@ -802,12 +712,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } // 先把已经物流异常但未查询到的订单改为正常 - var waybillExceptionOrders = GlobalConfig.lstOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId && o.orderItems.Any(oi => oi.ShopWaybillExceptionStr == "物流异常")).ToList(); + var waybillExceptionOrders = GlobalConfig.lstOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId && o.OrderItems.Any(oi => oi.ShopWaybillExceptionStr == "物流异常")).ToList(); foreach (var waybillExceptionOrder in waybillExceptionOrders) { if (!existOrderExtList.Any(oExt => oExt.order_id == waybillExceptionOrder.order_id)) { - foreach (var orderItem in waybillExceptionOrder.orderItems) + foreach (var orderItem in waybillExceptionOrder.OrderItems) { if (orderItem.OrderItemExt != null) { @@ -880,7 +790,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls var order = GlobalConfig.lstOrder.ToList().FirstOrDefault(o => o.order_id == orderExt.order_id); if (order != null) { - var orderItem = order.orderItems.ToList().FirstOrDefault(oi => oi.sku_id == orderExt.sku_id); + var orderItem = order.OrderItems.ToList().FirstOrDefault(oi => oi.sku_id == orderExt.sku_id); if (orderItem != null) { orderItem.OrderItemExt = orderExt; @@ -908,7 +818,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { foreach (var order in GlobalConfig.lstOrder) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { if (orderItem.order_id == "3738552208766960384") { @@ -925,7 +835,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 赋值显示订单元素 InitOrderItemObservableProp(orderItem); - MainWindow.Instance.orderListCtrl.FilterOneOrder(order); + await MainWindow.Instance.orderListCtrl.FilterOneOrder(order); // 第一个订单多个商品暂不支持,只操作一条记录 break; @@ -941,7 +851,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { foreach (var order in GlobalConfig.lstOrder) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { //// 测试写死 //if (orderItem.ItemOrder?.order_id == "3738160750339728384") @@ -953,7 +863,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls //} // 260801-439070256640980 260801-439070256640980 // string url = "https://mobile.yangkeduo.com/complaint.html?mode=128&after_sales_id=22059412840967&order_sn=260801-439070256640980" - if (orderItem.TransitRefundStatusStr.Contains("待用户发货") && !(orderItem.ItemTransitOrderAfterSale?.downstream_waybill).IsNullOrEmpty()) + if (orderItem.TransitRefundStatusStr != null && orderItem.TransitRefundStatusStr.Contains("待用户发货") && !(orderItem.ItemTransitOrderAfterSale?.downstream_waybill).IsNullOrEmpty()) { string orderSn = orderItem.ItemTransitOrderWithVoid.out_order_no; if (orderSn.IsNullOrEmpty()) @@ -1023,7 +933,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { foreach (var order in GlobalConfig.lstOrder) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { if (orderItem.order_id == "3739105285145538816") { @@ -1364,7 +1274,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - bool GetOrderIsFilter(oms_wei_order_info order, string filterHeadStr = null) + public bool GetOrderIsFilter(oms_wei_order_info order, string filterHeadStr = null) { if (order == null) return true; @@ -1393,22 +1303,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { bool isFilter = true; // 买手物流 - if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_1_waybill.ParseToString().Contains(strSearchAll)))) + if (order.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_1_waybill.ParseToString().Contains(strSearchAll)))) isFilter = false; // 仓库物流 - else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_2_waybill.ParseToString().Contains(strSearchAll)))) + else if (order.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_2_waybill.ParseToString().Contains(strSearchAll)))) isFilter = false; // 退货物流 - else if (order.refundItems.Any(ri => ri.return_waybill_id.ParseToString().Contains(strSearchAll))) + else if (order.RefundItems.Any(ri => ri.return_waybill_id.ParseToString().Contains(strSearchAll))) isFilter = false; // 退货单号 - else if (order.refundItems.Any(ri => ri.after_sale_order_id.ParseToString().Contains(strSearchAll))) + else if (order.RefundItems.Any(ri => ri.after_sale_order_id.ParseToString().Contains(strSearchAll))) isFilter = false; // 仓库采购单号 - else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no.ParseToString().Contains(strSearchAll)))) + else if (order.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no.ParseToString().Contains(strSearchAll)))) isFilter = false; // 仓库退款单号 - else if (order.orderItems.Any(oi => oi.ItemTransitOrderAfterSales.Any(t => t.refund_waybill.ParseToString().Contains(strSearchAll)))) + else if (order.OrderItems.Any(oi => oi.ItemTransitOrderAfterSales.Any(t => t.refund_waybill.ParseToString().Contains(strSearchAll)))) isFilter = false; // 直发订单号 else if (order.out_order_no.Contains(strSearchAll)) @@ -1428,19 +1338,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 过滤商品名称 if (orderFilterConfig.lstFilterGoodsName != null && orderFilterConfig.lstFilterGoodsName.Count > 0) { - if (orderFilterConfig.FilterGoodsNameType == "标题包含" && !orderFilterConfig.lstFilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name)))) + if (orderFilterConfig.FilterGoodsNameType == "标题包含" && !orderFilterConfig.lstFilterGoodsName.Any(name => order.OrderItems.Any(it => it.title.Contains(name)))) return true; - else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.lstFilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name)))) + else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.lstFilterGoodsName.Any(name => order.OrderItems.Any(it => it.title.Contains(name)))) return true; } // 过滤多子单订单 - if (orderFilterConfig.chkNoMultiOrderIsChecked && order.orderItems.Count() > 1) + if (orderFilterConfig.chkNoMultiOrderIsChecked && order.OrderItems.Count() > 1) { return true; } // 过滤非中转仓订单 if (orderFilterConfig.chkOnlyWarehouseOrderIsChecked && !order.IsWaitBuy && - order.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null) && order.orderItems.All(oi => oi.OrderItemExt?.buy_type != "直发")) + order.OrderItems.All(oi => oi.ItemTransitOrderWithVoid == null) && order.OrderItems.All(oi => oi.OrderItemExt?.buy_type != "直发")) { return true; } @@ -1531,11 +1441,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } if (!order.IsWaitBuy) return true; - if (chkMapSkuIsChecked == true && order.orderItems.Any(oi => oi.PddBuyMap == null)) + if (chkMapSkuIsChecked == true && order.OrderItems.Any(oi => oi.PddBuyMap == null)) return true; - if (chkMapProdIsChecked == true && order.orderItems.All(oi => oi.PddBuyMapSkus == null || oi.PddBuyMapSkus.Count == 0 || oi.PddBuyMap != null)) + if (chkMapProdIsChecked == true && order.OrderItems.All(oi => oi.PddBuyMapSkus == null || oi.PddBuyMapSkus.Count == 0 || oi.PddBuyMap != null)) return true; - if (chkNoMapProdIsChecked == true && (order.orderItems.All(oi => oi.PddBuyMap != null) || order.orderItems.All(oi => oi.PddBuyMapSkus != null && oi.PddBuyMapSkus.Count > 0))) + if (chkNoMapProdIsChecked == true && (order.OrderItems.All(oi => oi.PddBuyMap != null) || order.OrderItems.All(oi => oi.PddBuyMapSkus != null && oi.PddBuyMapSkus.Count > 0))) return true; } if (filterHeadStr.StartsWith("待发货")) @@ -1553,11 +1463,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls if (chkWaitSend72HourNoWaybillIsChecked == true) { - if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && + if (order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))) { } // 直发没有单号正常发货才判断中转仓总店是否超时发货 - else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && + else if (order.OrderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))) { } @@ -1566,12 +1476,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } else if (chkWaitSend48HourNoWaybillIsChecked == true) { - if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && + if (order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) && bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))) { } // 直发没有单号才判断中转仓总店是否超时发货 - else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && + else if (order.OrderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) && bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))) @@ -1588,33 +1498,33 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 需核对物流 if (chkNeedCheckExpressIsChecked == true) { - var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功")); + var rst1 = order.OrderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功")); var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no); if (!rst1 && !rst2) return true; } - if (chkWaitReceiveBuyerIsNotSendIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货")) + if (chkWaitReceiveBuyerIsNotSendIsChecked == true && order.OrderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货")) return true; - if (chkWaitReceiveBuyerIsSendIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货")) + if (chkWaitReceiveBuyerIsSendIsChecked == true && order.OrderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货")) return true; - if (chkWaitReceiveBuyerIsInWarehouseIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已送达")) + if (chkWaitReceiveBuyerIsInWarehouseIsChecked == true && order.OrderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已送达")) return true; - if (chkWaitReceiveWarehouseIsNotPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号")) + if (chkWaitReceiveWarehouseIsNotPickupIsChecked == true && order.OrderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号")) return true; - if (chkWaitReceiveWarehouseIsPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && oi.WarehouseWaybillStatusStr != "中转已入库")) + if (chkWaitReceiveWarehouseIsPickupIsChecked == true && order.OrderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && oi.WarehouseWaybillStatusStr != "中转已入库")) return true; - if (chkWaitReceiveWarehouseIsSendOutIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库")) + if (chkWaitReceiveWarehouseIsSendOutIsChecked == true && order.OrderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库")) return true; if (chk72HourNoWaybillIsChecked == true) { // 直发没有单号才判断中转仓总店是否超时发货 - if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && + if (order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))) { } - else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && + else if (order.OrderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && bOrder?.order_time <= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72)))) { } @@ -1624,11 +1534,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls else if (chk48HourNoWaybillIsChecked == true) { // 直发没有单号才判断中转仓总店是否超时发货 - if (order.orderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && + if (order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) && bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))) { } - else if (order.orderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && + else if (order.OrderItems.Any(oi => (oi.DirectPddBuyerOrders?.Count).IsNullOrZero() && oi.PddBuyerOrders.OrderByDescending(bo => bo.order_time).FirstOrDefault() is order_pdd_buyer_order bOrder && (bOrder?.tracking_number).IsNullOrEmpty() && (bOrder?.order_time < BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-48)) && bOrder.order_time >= BaseClass.DateTimeToTimestampSeconds(DateTime.Now.AddHours(-72))))) @@ -1646,43 +1556,43 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls if (!order.IsEmergencyManualReturnOrder) return true; - if (cmbRejectStatusText == "未申请" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "未申请")) + if (cmbRejectStatusText == "未申请" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "未申请")) return true; - if (cmbRejectStatusText == "申请中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "已申请拒收")) + if (cmbRejectStatusText == "申请中" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "已申请拒收")) return true; - if (cmbRejectStatusText == "申请成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请成功"))) + if (cmbRejectStatusText == "申请成功" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请成功"))) return true; - if (cmbRejectStatusText == "申请失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请失败"))) + if (cmbRejectStatusText == "申请失败" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请失败"))) return true; - if (cmbRejectStatusText == "拒收成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("拒收成功"))) + if (cmbRejectStatusText == "拒收成功" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("拒收成功"))) return true; if (order.order_id == "3739296914665288192") { } - if (cmbReturnPackageStatusText == "未拦截" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "未添加")) + if (cmbReturnPackageStatusText == "未拦截" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "未添加")) return true; - if (cmbReturnPackageStatusText == "拦截中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "已添加")) + if (cmbReturnPackageStatusText == "拦截中" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr == "已添加")) return true; - if (cmbReturnPackageStatusText == "拦截成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr.StartsWith("拦截成功"))) + if (cmbReturnPackageStatusText == "拦截成功" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr.StartsWith("拦截成功"))) return true; - if (cmbReturnPackageStatusText == "拦截失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr.StartsWith("拦截失败"))) + if (cmbReturnPackageStatusText == "拦截失败" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseAfterSaleStr.StartsWith("拦截失败"))) return true; - if (chkEmergencyBuyerWaitAfterSaleIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后"))) + if (chkEmergencyBuyerWaitAfterSaleIsChecked == true && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后"))) return true; - else if (chkEmergencyBuyerWaitSendBackIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货"))) + else if (chkEmergencyBuyerWaitSendBackIsChecked == true && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货"))) return true; - else if (chkEmergencyBuyerWaitSupplierRefundIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中"))) + else if (chkEmergencyBuyerWaitSupplierRefundIsChecked == true && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中"))) return true; - else if (chkEmergencyBuyerRefundFailIsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败"))) + else if (chkEmergencyBuyerRefundFailIsChecked == true && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败"))) return true; - if (chkEmergencyShopCustomRefundHasWaybillIsChecked == true && order.orderItems.Any(oi => oi.ReturnWaybillIdStr.IsNullOrEmpty())) + if (chkEmergencyShopCustomRefundHasWaybillIsChecked == true && order.OrderItems.Any(oi => oi.ReturnWaybillIdStr.IsNullOrEmpty())) return true; - else if (chkEmergencyShopCustomRefundNoWaybillIsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty())) + else if (chkEmergencyShopCustomRefundNoWaybillIsChecked == true && order.OrderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty())) return true; //// 退货仓 @@ -1693,10 +1603,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // return true; // 商家受理中 - if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "商家受理中")) + if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.OrderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "商家受理中")) return true; // 待商家收货 - if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "待商家收货")) + if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.OrderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "待商家收货")) return true; // 退款完成(但买手没退) if (chkEmergencyShopAfterSaleSuccessIsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成") @@ -1706,10 +1616,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls return true; // 退货退款 - if (chkEmergencyReturnIsChecked == true && !(order.refundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN")) + if (chkEmergencyReturnIsChecked == true && !(order.RefundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN")) return true; // 仅退款 - else if (chkEmergencyRefundIsChecked == true && !(order.refundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND")) + else if (chkEmergencyRefundIsChecked == true && !(order.RefundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND")) return true; } if (filterHeadStr.StartsWith("退货仓自动售后单")) @@ -1728,10 +1638,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { if (order.OrderBuyType == "云仓") { - if (order.orderItems.Any(oi => string.IsNullOrEmpty(oi.PddBuyerAfterSale?.afterSaleAddress))) + if (order.OrderItems.Any(oi => string.IsNullOrEmpty(oi.PddBuyerAfterSale?.afterSaleAddress))) return true; - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.PddBuyerAfterSale?.afterSaleAddress); if (!receiver.receiver_address.IsNullOrEmpty() && receiver.receiver_name.Length <= 15) @@ -1740,10 +1650,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } else { - if (order.orderItems.Any(oi => string.IsNullOrEmpty(oi.DirectPddBuyerAfterSale?.afterSaleAddress))) + if (order.OrderItems.Any(oi => string.IsNullOrEmpty(oi.DirectPddBuyerAfterSale?.afterSaleAddress))) return true; - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { var receiver = TransitReturnOrderWindow.PddAddressAnalysis(orderItem.DirectPddBuyerAfterSale?.afterSaleAddress); if (!receiver.receiver_address.IsNullOrEmpty() && receiver.receiver_name.Length <= 15) @@ -1752,24 +1662,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - if (cmbReturnOrderStatusText == "未创建" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "未创建")) + if (cmbReturnOrderStatusText == "未创建" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "未创建")) return true; - if (cmbReturnOrderStatusText == "创建失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "创建失败")) + if (cmbReturnOrderStatusText == "创建失败" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr == "创建失败")) return true; - if (cmbReturnOrderStatusText == "已创建未到仓" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已创建未到仓"))) + if (cmbReturnOrderStatusText == "已创建未到仓" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已创建未到仓"))) return true; - if (cmbReturnOrderStatusText == "已到仓" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已到仓"))) + if (cmbReturnOrderStatusText == "已到仓" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已到仓"))) return true; - if (cmbReturnOrderStatusText == "已发回" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已发回"))) + if (cmbReturnOrderStatusText == "已发回" && !order.OrderItems.Any(oi => oi.AddEditTransitWarehouseReturnOrderStr.StartsWith("已发回"))) return true; - if (cmbReturnOrderBuyerStatusText == "买手待申请售后" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后"))) + if (cmbReturnOrderBuyerStatusText == "买手待申请售后" && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后"))) return true; - else if (cmbReturnOrderBuyerStatusText == "买手待退货" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货"))) + else if (cmbReturnOrderBuyerStatusText == "买手待退货" && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货"))) return true; - else if (cmbReturnOrderBuyerStatusText == "买手已寄出待商家退款" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中"))) + else if (cmbReturnOrderBuyerStatusText == "买手已寄出待商家退款" && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中"))) return true; - else if (cmbReturnOrderBuyerStatusText == "买手退货失败" && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败"))) + else if (cmbReturnOrderBuyerStatusText == "买手退货失败" && order.OrderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败"))) return true; } if (filterHeadStr.StartsWith("售后完成单")) @@ -1782,11 +1692,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls else if (chkAftersaleIsNotSendIsChecked == true && !order.DeliveryDeadlineStr.Contains("未发货")) return true; - if (chkAftersaleBuyerIsBuyIsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr.IsNullOrEmpty())) + if (chkAftersaleBuyerIsBuyIsChecked == true && order.OrderItems.All(oi => oi.BuyerTransitWaybillStatusStr.IsNullOrEmpty())) return true; - if (chkAftersaleWarehouseIsNotPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号" && !oi.WarehouseWaybillStatusStr.Contains("取号异常"))) + if (chkAftersaleWarehouseIsNotPickupIsChecked == true && order.OrderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号" && !oi.WarehouseWaybillStatusStr.Contains("取号异常"))) return true; - if (chkAftersaleWarehouseIsPickupIsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && + if (chkAftersaleWarehouseIsPickupIsChecked == true && order.OrderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && oi.WarehouseWaybillStatusStr != "中转已入库" && oi.WarehouseWaybillStatusStr != "中转已出库")) return true; } @@ -2119,7 +2029,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls List tmpOrderItems = new List(); foreach (var order in orders) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { if (orderItem?.ItemOrder?.OrderBuyType == "云仓") { @@ -2175,7 +2085,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls List tmpOrderItems = new List(); foreach (var order in emergencyRefundOrders) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { // 用户仅退款的,拦截并退回总店,已到仓后自动去拼多多申请退货退款 if (orderItem.ItemRefund?.type != "REFUND") @@ -2209,7 +2119,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls List tmpOrderItems = new List(); foreach (var order in emergencyRefundOrders) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { if (order.order_id == "3739296914665288192") { @@ -2259,7 +2169,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls List tmpOrderItems = new List(); foreach (var order in emergencyRefundOrders) { - foreach (var orderItem in order.orderItems) + foreach (var orderItem in order.OrderItems) { if (order.order_id == "3739296914665288192") { @@ -2371,7 +2281,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls if (order == null) continue; oms_wei_order_item_info orderItem = null; - await Dispatcher.InvokeAsync(new Action(() => { orderItem = order.orderItems.FirstOrDefault(oi => oi.order_id == tmpOrderItem.order_id && oi.sku_id == tmpOrderItem.sku_id); })); + await Dispatcher.InvokeAsync(new Action(() => { orderItem = order.OrderItems.FirstOrDefault(oi => oi.order_id == tmpOrderItem.order_id && oi.sku_id == tmpOrderItem.sku_id); })); if (orderItem == null) continue; @@ -2905,7 +2815,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls private async void btnAutoBuy_Click(object sender, RoutedEventArgs e) { - var buyOrders = GlobalConfig.lstFilterOrder.Where(o => o.IsWaitBuy && o.orderItems?.Count == 1 && o.orderItems.FirstOrDefault()?.PddBuyMap != null && o.IsSelect == true).ToList(); + var buyOrders = GlobalConfig.lstFilterOrder.Where(o => o.IsWaitBuy && o.OrderItems?.Count == 1 && o.OrderItems.FirstOrDefault()?.PddBuyMap != null && o.IsSelect == true).ToList(); if (buyOrders.Count == 0) { BaseMsgWindow.ShowError("未勾选符合条件的订单!"); @@ -2918,7 +2828,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { try { - var orderItem = order.orderItems.FirstOrDefault(); + var orderItem = order.OrderItems.FirstOrDefault(); await OrderListRowItemCtrl.BuyOrder(orderItem, true); if (IsAutoBuy == false) break; diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml index 845d926..fb91a5f 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml @@ -51,23 +51,23 @@