删除不合适的仓库 优化订单和售后单读取
This commit is contained in:
1 parent
6f7aa58ac1
commit
13b68fa64e
53 files changed
+14843
-820
No files matched your search
@@ -24,7 +24,6 @@ using System.Windows.Media.Imaging;
|
||||
using System.Windows.Shapes;
|
||||
using TemuKJD.ToolForms;
|
||||
using Work;
|
||||
using Work.BLL;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
@@ -44,6 +43,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
|
||||
dateStart.SelectedDate = DateTime.Now.Date.AddDays(-7);
|
||||
@@ -127,7 +127,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -142,12 +142,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var url1 = BaseClass.Build29WxObjString("order/get_order_item_list");
|
||||
var data1 = UserLogin.GetSignaturex();
|
||||
data1 += "&erp_order_id_in=" + order_ids;
|
||||
data1 += "&page_size=" + 1000;
|
||||
var html1 = GetHtml.PostUtf8(url1, data1);
|
||||
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
||||
html1 = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
|
||||
@@ -164,7 +165,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
html2 = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
|
||||
@@ -182,7 +183,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
}));
|
||||
break;
|
||||
}
|
||||
@@ -202,7 +203,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
}));
|
||||
break;
|
||||
}
|
||||
@@ -210,75 +211,82 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
try { byuMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString()); } catch { }
|
||||
|
||||
|
||||
|
||||
// 装载订单
|
||||
foreach (JObject jObj in jArr)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
try
|
||||
{
|
||||
try
|
||||
oms_wei_order_info order = null;
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
var order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
//装载订单商品详情
|
||||
order.order_items = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
if (order.order_id == "3737398647233862400")
|
||||
{
|
||||
// 订单商品
|
||||
item.item_order = order;
|
||||
order.order_items.Add(item);
|
||||
|
||||
// 关联拍单关系
|
||||
if (PddMobileBuyOrderForm.lstDangerItemWord.Any(d => item.title.Contains(d)))
|
||||
{
|
||||
// 危险物品禁止拍单
|
||||
}
|
||||
else
|
||||
{
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
|
||||
}
|
||||
|
||||
// 中转仓订单
|
||||
if (item.item_order.order_items.Count > 1)
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
else
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||
}
|
||||
//装载订单售后详情
|
||||
order.refunds = new ObservableCollection<oms_wei_refund_info>();
|
||||
foreach (var item in refunds.Where(of => of.order_id == order.order_id))
|
||||
}));
|
||||
//装载订单商品详情
|
||||
order.orderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
// 订单商品
|
||||
item.ItemOrder = order;
|
||||
order.orderItems.Add(item);
|
||||
|
||||
item.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)))
|
||||
{
|
||||
order.refunds.Add(item);
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.BuyMap == null)
|
||||
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
}
|
||||
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
GlobalConfig.lstOrder.Remove(orderExist);
|
||||
|
||||
var nextOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Insert(GlobalConfig.lstOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
// 中转仓订单
|
||||
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
|
||||
{
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
}
|
||||
if (order.order_items.Count > 1)
|
||||
{
|
||||
}
|
||||
|
||||
FilterOneOrder(order);
|
||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||
}
|
||||
catch (Exception ex)
|
||||
//装载订单售后详情
|
||||
order.refundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.SetItemRefund(order.refundItems.ToList());
|
||||
}
|
||||
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
GlobalConfig.lstOrder.Remove(orderExist);
|
||||
|
||||
var nextOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Insert(GlobalConfig.lstOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
}
|
||||
if (order.orderItems.Count > 1)
|
||||
{
|
||||
}
|
||||
}));
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
FilterOneOrder(order);
|
||||
}));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
@@ -338,17 +346,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (var order in GlobalConfig.lstFilterOrder.ToList())
|
||||
{
|
||||
if (GetOrderIsFilter(order))
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(order);
|
||||
}
|
||||
}
|
||||
foreach (var order in GlobalConfig.lstOrder.ToList())
|
||||
{
|
||||
FilterOneOrder(order);
|
||||
}
|
||||
//foreach (var order in GlobalConfig.lstFilterOrder.ToList())
|
||||
//{
|
||||
// if (GetOrderIsFilter(order))
|
||||
// {
|
||||
// GlobalConfig.lstFilterOrder.Remove(order);
|
||||
// }
|
||||
//}
|
||||
//foreach (var order in GlobalConfig.lstOrder.ToList())
|
||||
//{
|
||||
// FilterOneOrder(order);
|
||||
//}
|
||||
GlobalConfig.lstFilterOrder = new ObservableCollection<oms_wei_order_info>(GlobalConfig.lstOrder.Where(o => !GetOrderIsFilter(o)));
|
||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
Dispatcher.Invoke(new Action(() => {
|
||||
txtFilterCount.Text = "当前条件共计 " + GlobalConfig.lstFilterOrder.Count().ToString() + " 条订单记录";
|
||||
}));
|
||||
@@ -399,7 +409,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
}
|
||||
// 过滤商品名称
|
||||
if (!string.IsNullOrEmpty(txtGoodsName.Text.Trim()) && !order.order_items.Any(it => it.title.Contains(txtGoodsName.Text.Trim())))
|
||||
if (!string.IsNullOrEmpty(txtGoodsName.Text.Trim()) && !order.orderItems.Any(it => it.title.Contains(txtGoodsName.Text.Trim())))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -412,7 +422,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (!order.IsWaitBuy)
|
||||
return true;
|
||||
if (chkNoMapProdOnly.IsChecked == true && order.order_items.All(oi => oi.buy_map != null))
|
||||
if (chkMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap == null))
|
||||
return true;
|
||||
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("待发货") && !order.IsWaitSend)
|
||||
@@ -533,8 +545,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void chkNoMapProdOnly_Checked(object sender, RoutedEventArgs e)
|
||||
private void chkMapProdOnly_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (chkMapProdOnly.IsChecked == true)
|
||||
chkNoMapProdOnly.IsChecked = false;
|
||||
FilterOrders();
|
||||
}
|
||||
private void chkNoMapProdOnly_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (chkNoMapProdOnly.IsChecked == true)
|
||||
chkMapProdOnly.IsChecked = false;
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user