订单消费统计 商品标题筛选逻辑优化
This commit is contained in:
1 parent
ec9a856bc5
commit
261d580407
6 files changed
+98
-31
No files matched your search
@@ -45,6 +45,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
public partial class OrderListCtrl : UserControl
|
||||
{
|
||||
public CheckBox chkSelectAll = null;
|
||||
public OrderFilterConfig orderFilterConfig = null;
|
||||
|
||||
public bool IsAutoReadOrder = true;
|
||||
public DateTime nextGetOrderTime = DateTime.MinValue;
|
||||
@@ -62,6 +63,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||
|
||||
orderFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<OrderFilterConfig>("wx_order_filter_config");
|
||||
if (orderFilterConfig == null)
|
||||
orderFilterConfig = new OrderFilterConfig();
|
||||
this.txtFilterGoodsName.Text = string.Join(";", orderFilterConfig.FilterGoodsName);
|
||||
this.cmbFilterGoodsNameType.SelectedItem = cmbFilterGoodsNameType.Items.Cast<ComboBoxItem>().FirstOrDefault(tb => (tb.Content as TextBlock)?.Text == orderFilterConfig.FilterGoodsNameType);
|
||||
|
||||
dateStart.SelectedDate = DateTime.Now.Date.AddDays(-7);
|
||||
dateEnd.SelectedDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
|
||||
|
||||
@@ -950,9 +957,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return true;
|
||||
}
|
||||
// 过滤商品名称
|
||||
if (!string.IsNullOrEmpty(txtGoodsName.Text.Trim()) && !order.orderItems.Any(it => it.title.Contains(txtGoodsName.Text.Trim())))
|
||||
if (!string.IsNullOrEmpty(txtFilterGoodsName.Text.Trim()))
|
||||
{
|
||||
return true;
|
||||
if (orderFilterConfig.FilterGoodsNameType == "标题包含" && !orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
|
||||
return true;
|
||||
else if (orderFilterConfig.FilterGoodsNameType == "标题不含" && orderFilterConfig.FilterGoodsName.Any(name => order.orderItems.Any(it => it.title.Contains(name))))
|
||||
return true;
|
||||
}
|
||||
// 过滤id
|
||||
if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()) && !(";" + txtOrderId.Text.Trim().Replace(' ', ';').Replace(',', ';') + ";").Contains(";" + order.order_id + ";"))
|
||||
@@ -1783,5 +1793,35 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
return HttpResponseYkdBLL.YangkeduoPostResponse(buyer, url, body, referer);
|
||||
}
|
||||
|
||||
private void txtGoodsNameFilter_TextChanged(object sender, TextChangedEventArgs e)
|
||||
{
|
||||
if (IsLoaded)
|
||||
{
|
||||
if (string.Join(";", orderFilterConfig.FilterGoodsName) != txtFilterGoodsName.Text)
|
||||
{
|
||||
orderFilterConfig.FilterGoodsName = txtFilterGoodsName.Text.Split(new string[] { ";", ";", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList();
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_order_filter_config", orderFilterConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbFilterGoodsNameType_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (IsLoaded)
|
||||
{
|
||||
if (orderFilterConfig.FilterGoodsNameType != ((cmbFilterGoodsNameType.SelectedItem as ComboBoxItem)?.Content as TextBlock)?.Text)
|
||||
{
|
||||
orderFilterConfig.FilterGoodsNameType = ((cmbFilterGoodsNameType.SelectedItem as ComboBoxItem)?.Content as TextBlock)?.Text;
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_order_filter_config", orderFilterConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class OrderFilterConfig
|
||||
{
|
||||
public string FilterGoodsNameType { get; set; } = "标题包含";
|
||||
public List<string> FilterGoodsName { get; set; } = new List<string>();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user