商品优化功能,筛选功能优化

This commit is contained in:
wule committed 2026-08-28 19:05:00 +08:00
1 parent aeb30c1171
commit c70fa07d7d
15 files changed
+1600 -68

No files matched your search

@@ -1450,15 +1450,25 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (chkNoMapProdOnly.IsChecked == true && order.orderItems.All(oi => oi.BuyMap != null))
return true;
}
if (filterHeadStr.StartsWith("待发货") && !order.IsWaitSend)
if (filterHeadStr.StartsWith("待发货"))
{
return true;
if (!order.IsWaitSend)
return true;
// 直拍发货失败
if (chkDirectSendFailed.IsChecked == true)
{
var rst2 = order.out_shipped == 2 && !string.IsNullOrEmpty(order.out_express_no);
if (!rst2)
return true;
}
}
if (filterHeadStr.StartsWith("待收货"))
{
if (!order.IsWaitReceive)
return true;
// 需核对物流
if (chkNeedCheckExpress.IsChecked == true)
{
var rst1 = order.orderItems.Any(oi => !oi.TransitRefundStatusStr.IsNullOrEmpty() && !oi.TransitRefundStatusStr.Contains("退款成功"));
@@ -1547,6 +1557,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
if (!order.IsEmergencyDistribReturnOrder)
return true;
// 退款完成(但买手没退)
if (chkShopIsRefund.IsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
return true;
// 退款中
else if (chkShopIsNotRefund.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
return true;
}
if (filterHeadStr.StartsWith("售后完成单"))
{
@@ -2543,6 +2559,28 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
FilterOrders();
}
private void chkShopIsRefund_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
chkShopIsRefund.IsChecked = chkShopIsNotRefund.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
}
private void chkDirectSendFailed_Click(object sender, RoutedEventArgs e)
{
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
chkDirectSendFailed.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
}
}
public class OrderFilterConfig : PropertyNotifyObject