|
|
|
@@ -1841,7 +1841,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return FilterTabPage(order, filterHeadStr);
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
return FilterTabPage(order, filterHeadStr);
|
|
|
|
|
}
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
{
|
|
|
|
|
BaseMsgWindow.ShowAnimateMessage("订单 " + order.order_id + " 子筛选发生错误:" + ex.Message);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
@@ -2026,14 +2034,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|
|
|
|
//if (chkReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
|
|
|
|
|
// return true;
|
|
|
|
|
//// 非退货仓
|
|
|
|
|
//else if (chkNotReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
|
|
|
|
//else if (chkNotReturnOrderAddressIsChecked == true && order.orderItems?.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
|
|
|
|
// 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 != "退款完成")
|
|
|
|
@@ -2043,10 +2051,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("退货仓自动售后单"))
|
|
|
|
|