订单分类显示 快递金额明细统计, 快递在线充值 等

This commit is contained in:
wule committed 2026-07-24 11:16:37 +08:00
1 parent 7264835cc6
commit e00209cb24
37 files changed
+2764 -520

No files matched your search

+26 -20
View File
@@ -49,7 +49,7 @@ namespace AllBase.Model.DBModel
if (!string.IsNullOrEmpty(out_order_no))
{
var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
if (oi == null)
if (oi == null && out_after_sale_status != "退款成功")
return false;
}
return true;
@@ -76,7 +76,7 @@ namespace AllBase.Model.DBModel
if (!string.IsNullOrEmpty(out_order_no))
{
var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
if (oi != null)
if (oi != null || out_after_sale_status == "退款成功")
return false;
}
return true;
@@ -88,15 +88,16 @@ namespace AllBase.Model.DBModel
/// </summary>
public bool IsWaitReceive
{
get { return status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2; }
get { return (status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2) && orderItems?.Any(oi => oi.refund_status > 1) != true; }
set { }
}
/// <summary>
/// 售后订单(含售后关闭)
/// 售后订单(不含售后关闭)
/// </summary>
public bool IsRefund
{
get { return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); }
//get { return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); }
get { return orderItems.Any(oi => oi.refund_status > 1) && !IsEmergency; }
set { }
}
public bool IsRefundWithCancel
@@ -111,11 +112,11 @@ namespace AllBase.Model.DBModel
{
get
{
if (orderItems.Any(oi => oi.id == 3737775520624572928))
if (this.order_id == "3737682397646176256")
{
}
if (orderItems.Any(oi => oi.refund_status > 0 && oi.ItemTransitOrders.Count > 0 &&
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3 || oi.ItemTransitOrders.Count > 0 &&
oi.ItemTransitOrders.Any(t => !string.IsNullOrEmpty(t.refund_status) &&
!t.refund_status.Contains("退款成功") &&
!t.refund_status.Contains("关闭") &&
@@ -123,9 +124,6 @@ namespace AllBase.Model.DBModel
{
return true;
}
else if (orderItems.Any(oi => (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") &&
oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
return true;
return false;
}
set { }
@@ -145,6 +143,13 @@ namespace AllBase.Model.DBModel
// 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
return true;
// 取号异常或无法调用发货也放在异常单
// 订单不满足鸿浩仓库发货条件,无法调用鸿浩仓库接口发货
else if (orderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
(oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
return true;
return false;
}
set { }
@@ -208,7 +213,7 @@ namespace AllBase.Model.DBModel
/// <summary>
/// 订单总状态文本
/// </summary>
public string delivery_deadline_status_str
public string DeliveryDeadlineDtatusStr
{
get
{
@@ -217,7 +222,8 @@ namespace AllBase.Model.DBModel
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
return "退款完成";
// 用户取消申请
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("退款单") && this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成订单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后订单")) &&
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
if (this.status == 20 || this.status == 21)
{
@@ -225,13 +231,13 @@ namespace AllBase.Model.DBModel
}
return "剩余";
}
set { /*delivery_deadline_status_str = value;*/ }
set { }
}
/// <summary>
/// 延迟发货时间(微信小店:商品发货时效,超时此时间未发货即为发货超时)文本
/// </summary>
public string delivery_deadline_str
public string DeliveryDeadlineStr
{
get
{
@@ -258,9 +264,9 @@ namespace AllBase.Model.DBModel
{
get
{
if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
return new SolidColorBrush(Color.FromRgb(250, 71, 51)); // #fa4733
else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
return new SolidColorBrush(Color.FromRgb(103, 194, 58)); // #67c23a
else
return new SolidColorBrush(Color.FromRgb(3, 151, 181)); // #0397b5
@@ -271,9 +277,9 @@ namespace AllBase.Model.DBModel
{
get
{
if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
return new SolidColorBrush(Color.FromArgb(26, 250, 71, 51)); // #fa4733 0.2
else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
return new SolidColorBrush(Color.FromArgb(26, 103, 194, 58)); // #67c23a 0.2
else
return new SolidColorBrush(Color.FromArgb(26, 3, 151, 181)); // #0397b5 0.2
@@ -284,9 +290,9 @@ namespace AllBase.Model.DBModel
{
get
{
if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
return new SolidColorBrush(Color.FromArgb(50, 250, 71, 51)); // #fa4733 0.2
else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
return new SolidColorBrush(Color.FromArgb(50, 103, 194, 58)); // #67c23a 0.2
else
return new SolidColorBrush(Color.FromArgb(50, 3, 151, 181)); // #0397b5 0.2