订单列表显示功能及逻辑优化
This commit is contained in:
1 parent
44503f91cf
commit
031fa8cfe6
21 files changed
+815
-134
No files matched your search
@@ -1,4 +1,5 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.Utils;
|
||||
using AllBase;
|
||||
using AllBase.Extension;
|
||||
using AllBase.Helper;
|
||||
@@ -31,9 +32,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
/// </summary>
|
||||
public partial class OrderListCtrl : UserControl
|
||||
{
|
||||
public ObservableCollection<oms_wei_order_info> lstOrder { get; set; } = new ObservableCollection<oms_wei_order_info>();
|
||||
public List<oms_wei_order_info> lstOrder1 { get; set; } = new List<oms_wei_order_info>();
|
||||
public static ObservableCollection<oms_wei_order_info> lstOrder { get; set; } = new ObservableCollection<oms_wei_order_info>();
|
||||
public static ObservableCollection<oms_wei_order_info> lstFilterOrder { get; set; } = new ObservableCollection<oms_wei_order_info>();
|
||||
|
||||
public CheckBox chkSelectAll = null;
|
||||
|
||||
public OrderListCtrl()
|
||||
{
|
||||
@@ -43,15 +45,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//MyData newItem = new MyData { Name = "New Person", Age = 28 }; // 创建新数据项
|
||||
//_myDataCollection.Add(newItem); // 添加到集合中
|
||||
//dataGrid.Items.Refresh();.
|
||||
//dgOrder.Items.Add(1111111);
|
||||
|
||||
//dgOrder.ItemsSource = lstOrder;
|
||||
//lbxOrder.ItemsSource = lstOrder;
|
||||
|
||||
dateStart.SelectedDate = DateTime.Now.Date.AddDays(-30);
|
||||
dateStart.SelectedDate = DateTime.Now.Date.AddDays(-7);
|
||||
dateEnd.SelectedDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
|
||||
|
||||
Task.Run(() =>
|
||||
@@ -70,14 +64,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
for (int i = 0; i < 10000; i++)
|
||||
{
|
||||
//lstOrder.Add(new oms_wei_order_info() { id = 1, is_select = false, order_id = ("3737033423685556736".ParseToLong() + Randomx.GetId(0,100)).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
lstOrder.Add(new oms_wei_order_info() { id = 1, is_select = false, order_id = Randomx.GetId(1000, 10000).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
//lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = ("3737033423685556736".ParseToLong() + Randomx.GetId(0,100)).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = Randomx.GetId(1000, 10000).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
}
|
||||
lstOrder.SortDesc(o => o.order_id.ParseToLong());
|
||||
}
|
||||
|
||||
void GetOrder()
|
||||
void GetOrder(bool filterGetCondition = false)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
btnSearch.IsEnabled = false;
|
||||
}));
|
||||
Task.Run(() =>
|
||||
{
|
||||
int page = 0;
|
||||
@@ -98,25 +96,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
if (!string.IsNullOrEmpty(txtShopName.Text.Trim()))
|
||||
// 按过滤条件读取
|
||||
if (filterGetCondition)
|
||||
{
|
||||
var shopNames = txtShopName.Text.Trim().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()));
|
||||
if (!string.IsNullOrEmpty(txtShopName.Text.Trim()))
|
||||
{
|
||||
var shopNames = txtShopName.Text.Trim().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.SelectedDate.Value);
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(dateEnd.SelectedDate.Value);
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(dateEnd.SelectedDate.Value.AddDays(1));
|
||||
data += "&erp_shop_id_in=" + shop_id;
|
||||
data += "&start_time=" + startTime;
|
||||
data += "&end_time=" + endTime;
|
||||
}));
|
||||
Thread.Sleep(200);
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -124,33 +125,191 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (jArr.Count() == 0)
|
||||
break;
|
||||
|
||||
var order_ids = string.Join(",", jArr.Select(a => a["order_id"].ParseToString()));
|
||||
if (order_ids.Contains("3737210716522443776"))
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
var url1 = BaseClass.Build29WxObjString("order/get_order_item_list");
|
||||
var data1 = UserLogin.GetSignaturex();
|
||||
data1 += "&erp_order_id_in=" + order_ids;
|
||||
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"));
|
||||
break;
|
||||
}
|
||||
|
||||
List<oms_wei_order_item> orderItems = new List<oms_wei_order_item>();
|
||||
try { orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item>(JObject.Parse(html1)["data"].ParseToString()); } catch { }
|
||||
|
||||
foreach (JObject jObj in jArr)
|
||||
{
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
var order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
var orderExist = this.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
this.lstOrder.Remove(orderExist);
|
||||
try
|
||||
{
|
||||
var order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
|
||||
order.order_items = new ObservableCollection<oms_wei_order_item>();
|
||||
foreach(var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
if (item.cash_coupon_discounted_price > 0)
|
||||
{
|
||||
|
||||
var nextOrder = this.lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
lstOrder.Insert(lstOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
order.order_items.Add(item);
|
||||
}
|
||||
|
||||
var orderExist = lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
lstOrder.Remove(orderExist);
|
||||
|
||||
var nextOrder = lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
lstOrder.Insert(lstOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
else
|
||||
{
|
||||
lstOrder.Add(order);
|
||||
}
|
||||
|
||||
FilterOneOrder(order);
|
||||
}
|
||||
else
|
||||
catch (Exception ex)
|
||||
{
|
||||
lstOrder.Add(order);
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
Dispatcher.Invoke(new Action(() => {
|
||||
var tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("待采购"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
tabItem.Header = "待采购(" + lstOrder.Where(r => r.purchase_status == 0 && r.status == 20).Count() + ")";
|
||||
}
|
||||
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
tabItem.Header = "待发货(" + lstOrder.Where(r => r.purchase_status == 1 && r.status == 20).Count() + ")";
|
||||
}
|
||||
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
tabItem.Header = "待收货(" + lstOrder.Where(r =>/* r.purchase_status == 1 &&*/ (r.status == 30 || r.status == 100)).Count() + ")";
|
||||
}
|
||||
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
tabItem.Header = "退款单(" + lstOrder.Where(r => r.status == 200).Count() + ")";
|
||||
}
|
||||
tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
|
||||
if (tabItem != null)
|
||||
{
|
||||
tabItem.Header = "全部订单(" + lstOrder.Count() + ")";
|
||||
}
|
||||
txtFilterCount.Text = "当前条件共计 " + lstFilterOrder.Count() + " 条订单记录";
|
||||
}));
|
||||
|
||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
||||
if (totalCount > 0)
|
||||
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
btnSearch.IsEnabled = true;
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
void FilterOrders()
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (var order in lstFilterOrder.ToList())
|
||||
{
|
||||
if (GetOrderIsFilter(order))
|
||||
{
|
||||
lstFilterOrder.Remove(order);
|
||||
}
|
||||
}
|
||||
foreach (var order in lstOrder.ToList())
|
||||
{
|
||||
FilterOneOrder(order);
|
||||
}
|
||||
Dispatcher.Invoke(new Action(() => {
|
||||
txtFilterCount.Text = "当前条件共计 " + lstFilterOrder.Count().ToString() + " 条订单记录";
|
||||
}));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void FilterOneOrder(oms_wei_order_info order)
|
||||
{
|
||||
if (!GetOrderIsFilter(order))
|
||||
{
|
||||
var orderExist = lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist != null)
|
||||
lstFilterOrder.Remove(orderExist);
|
||||
|
||||
var nextOrder = lstFilterOrder.FirstOrDefault(o => o.create_time < order.create_time);
|
||||
if (nextOrder != null)
|
||||
{
|
||||
lstFilterOrder.Insert(lstFilterOrder.IndexOf(nextOrder), order);
|
||||
}
|
||||
else
|
||||
{
|
||||
lstFilterOrder.Add(order);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool GetOrderIsFilter(oms_wei_order_info order)
|
||||
{
|
||||
if (order.order_id == "3737234765235244032")
|
||||
{
|
||||
|
||||
}
|
||||
if (order == null) return true;
|
||||
if (!string.IsNullOrEmpty(txtShopName.Text.Trim()) && !(";" + txtShopName.Text.Trim() + ";").Contains(";" + order.shop_name + ";"))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(txtGoodsName.Text.Trim()) && !order.order_items.Any(it => it.title.Contains(txtGoodsName.Text.Trim())))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("待采购") && (order.purchase_status != 0 || order.status != 20))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("待发货") && (order.purchase_status != 1 || order.status != 20))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("待收货") && (/*order.purchase_status != 1 ||*/ (order.status != 30 && order.status != 100)))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("退款单") && (order.status != 200))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private void btnMultiShopChoice_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
MainWindow.Instance.shopListCtrl.IsVisibleChanged -= ShopListCtrl_IsVisibleChanged;
|
||||
@@ -166,12 +325,91 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (list != null)
|
||||
this.txtShopName.Text = string.Join(";", list.Where(s => s.IsSelect == true).Select(s => s.ShopAccount));
|
||||
|
||||
FilterOrders();
|
||||
|
||||
}
|
||||
MainWindow.Instance.shopListCtrl.IsVisibleChanged -= ShopListCtrl_IsVisibleChanged;
|
||||
}
|
||||
|
||||
private void btnSearch_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
GetOrder();
|
||||
}
|
||||
|
||||
private void btnFilter_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void dgOrderHeader_ColumnDisplayIndexChanged(object sender, DataGridColumnEventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
private void dgOrderHeader_LayoutUpdated(object sender, EventArgs e)
|
||||
{
|
||||
foreach (var item in lbxOrder.Items)
|
||||
{
|
||||
ListBoxItem container = (ListBoxItem)lbxOrder.ItemContainerGenerator.ContainerFromIndex(lbxOrder.Items.IndexOf(item));
|
||||
if (container != null)
|
||||
{
|
||||
// 找到grid控件并修改列大小
|
||||
Grid grid = UiCtrlUtils.FindVisualChild<Grid>(container, "gridListItem");
|
||||
if (grid != null)
|
||||
{
|
||||
for (int i = 0; i < grid.ColumnDefinitions.Count; i++)
|
||||
{
|
||||
if (dgOrderHeader.Columns.Count > i)
|
||||
{
|
||||
// 最后一列因滚动条变窄,已在表头补偿
|
||||
if (i == grid.ColumnDefinitions.Count - 1)
|
||||
grid.ColumnDefinitions[i].Width = new GridLength(Math.Max(0, dgOrderHeader.Columns[i].ActualWidth - 0));
|
||||
else
|
||||
grid.ColumnDefinitions[i].Width = new GridLength(dgOrderHeader.Columns[i].ActualWidth);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void ChkSelectAll_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
foreach (var order in lstOrder.ToList())
|
||||
{
|
||||
order.IsSelect = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void ChkSelectAll_Unchecked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
foreach (var order in lstOrder.ToList())
|
||||
{
|
||||
order.IsSelect = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void ChkSelectAll_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
chkSelectAll = sender as CheckBox;
|
||||
}
|
||||
|
||||
public void UpdateChkAllBox ()
|
||||
{
|
||||
chkSelectAll.Checked -= ChkSelectAll_Checked;
|
||||
chkSelectAll.Unchecked -= ChkSelectAll_Unchecked;
|
||||
if (lstFilterOrder.All(s => s.IsSelect))
|
||||
chkSelectAll.IsChecked = true;
|
||||
else if (lstFilterOrder.All(s => !s.IsSelect))
|
||||
chkSelectAll.IsChecked = false;
|
||||
else
|
||||
chkSelectAll.IsChecked = null;
|
||||
chkSelectAll.Checked += ChkSelectAll_Checked;
|
||||
chkSelectAll.Unchecked += ChkSelectAll_Unchecked;
|
||||
}
|
||||
|
||||
private void tabOrderType_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user