继续优化订单读取和展示
This commit is contained in:
1 parent
1509e0a11d
commit
2f9c98b105
6 files changed
+1682
-1646
No files matched your search
@@ -74,74 +74,35 @@ namespace AllBase.Model.DBModel
|
||||
/// 售后订单(不含售后关闭) -- 改为售后完成单 260726
|
||||
/// </summary>
|
||||
public bool IsRefund
|
||||
{
|
||||
get
|
||||
{
|
||||
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
|
||||
if (!orderItems.Any(oi => oi.refund_status > 1))
|
||||
return false;
|
||||
if (IsEmergency)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
set { }
|
||||
}
|
||||
{
|
||||
get { return this.GetValue(x => x.IsRefund); }
|
||||
set { this.SetValue(x => x.IsRefund, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 紧急订单
|
||||
/// </summary>
|
||||
public bool IsEmergency
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.order_id == "3737858759084367872")
|
||||
{
|
||||
}
|
||||
// 微信订单退货中
|
||||
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
// 微信订单退款中或退款成功,但是买手订单未完成退款
|
||||
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
set { }
|
||||
{
|
||||
get { return this.GetValue(x => x.IsEmergency); }
|
||||
set { this.SetValue(x => x.IsEmergency, value); }
|
||||
}
|
||||
|
||||
public bool IsEmergencyDistribReturnOrder
|
||||
{
|
||||
get
|
||||
{
|
||||
return IsEmergency && IsDistribReturnOrder;
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.IsEmergencyDistribReturnOrder); }
|
||||
set { this.SetValue(x => x.IsEmergencyDistribReturnOrder, value); }
|
||||
}
|
||||
public bool IsEmergencyManualReturnOrder
|
||||
{
|
||||
get
|
||||
{
|
||||
return IsEmergency && !IsDistribReturnOrder;
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.IsEmergencyManualReturnOrder); }
|
||||
set { this.SetValue(x => x.IsEmergencyManualReturnOrder, value); }
|
||||
}
|
||||
|
||||
public bool IsDistribReturnOrder
|
||||
{
|
||||
get
|
||||
{
|
||||
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
|
||||
}
|
||||
set { }
|
||||
get { return this.GetValue(x => x.IsDistribReturnOrder); }
|
||||
set { this.SetValue(x => x.IsDistribReturnOrder, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 异常单(买手异常退货)异常需重拍
|
||||
@@ -219,42 +180,49 @@ namespace AllBase.Model.DBModel
|
||||
/// <summary>
|
||||
/// 订单发货完成时间
|
||||
/// </summary>
|
||||
public string ship_done_time_str
|
||||
{
|
||||
get { return BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); }
|
||||
set { }
|
||||
}
|
||||
public string ShipDoneTimeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.ShipDoneTimeStr); }
|
||||
set { this.SetValue(x => x.ShipDoneTimeStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 订单发货完成时间可见
|
||||
/// </summary>
|
||||
public Visibility ship_done_time_visibility
|
||||
{
|
||||
get { return this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed; }
|
||||
set { }
|
||||
}
|
||||
public Visibility ShipDoneTimeVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.ShipDoneTimeVisibility); }
|
||||
set { this.SetValue(x => x.ShipDoneTimeVisibility, value); }
|
||||
}
|
||||
void SetShipDoneTimeStr()
|
||||
{
|
||||
ShipDoneTimeStr = BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
|
||||
ShipDoneTimeVisibility = this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订单总状态文本
|
||||
/// </summary>
|
||||
public string DeliveryDeadlineStatusStr
|
||||
/// <summary>
|
||||
/// 订单总状态文本
|
||||
/// </summary>
|
||||
public string DeliveryDeadlineStatusStr
|
||||
{
|
||||
get
|
||||
get { return this.GetValue(x => x.DeliveryDeadlineStatusStr); }
|
||||
set { this.SetValue(x => x.DeliveryDeadlineStatusStr, value); }
|
||||
}
|
||||
void SetDeliveryDeadlineStatusStr()
|
||||
{
|
||||
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
|
||||
DeliveryDeadlineStatusStr = "退款中";
|
||||
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
|
||||
DeliveryDeadlineStatusStr = "退款完成";
|
||||
// 用户取消申请
|
||||
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
|
||||
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
|
||||
DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
|
||||
else if (this.status == 20 || this.status == 21)
|
||||
{
|
||||
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
|
||||
return "退款中";
|
||||
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
|
||||
return "退款完成";
|
||||
// 用户取消申请
|
||||
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || 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)
|
||||
{
|
||||
return "剩余";
|
||||
}
|
||||
return "剩余";
|
||||
DeliveryDeadlineStatusStr = "剩余";
|
||||
}
|
||||
set { }
|
||||
else
|
||||
DeliveryDeadlineStatusStr = "剩余";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -332,26 +300,24 @@ namespace AllBase.Model.DBModel
|
||||
}
|
||||
|
||||
public string OutExpressNoStr
|
||||
{
|
||||
get
|
||||
{
|
||||
if (order_id == "3738634560083228416")
|
||||
{
|
||||
|
||||
}
|
||||
if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
|
||||
return this.out_express_no + " ×";
|
||||
return this.out_express_no;
|
||||
}
|
||||
set { }
|
||||
}
|
||||
{
|
||||
get { return this.GetValue(x => x.OutExpressNoStr); }
|
||||
set { this.SetValue(x => x.OutExpressNoStr, value); }
|
||||
}
|
||||
public SolidColorBrush OutExpressNoBrush
|
||||
{
|
||||
get
|
||||
{
|
||||
return OutExpressNoStr.EndsWith(" ×") ? GlobalConfig.RedTextBrush : GlobalConfig.BlackBrush;
|
||||
}
|
||||
}
|
||||
{
|
||||
get { return this.GetValue(x => x.OutExpressNoBrush); }
|
||||
set { this.SetValue(x => x.OutExpressNoBrush, value); }
|
||||
}
|
||||
void SetOutExpressNo()
|
||||
{
|
||||
if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
|
||||
OutExpressNoStr = this.out_express_no + " ×";
|
||||
else
|
||||
OutExpressNoStr = this.out_express_no;
|
||||
|
||||
OutExpressNoBrush = OutExpressNoStr.EndsWith(" ×") ? GlobalConfig.RedTextBrush : GlobalConfig.BlackBrush;
|
||||
}
|
||||
|
||||
public string GiftOrderStatusStr
|
||||
{
|
||||
@@ -744,11 +710,11 @@ namespace AllBase.Model.DBModel
|
||||
IsWaitBuy = GetIsWaitBuy();
|
||||
IsWaitSend = GetIsWaitSend();
|
||||
IsWaitReceive = GetIsWaitReceive();
|
||||
|
||||
if (order_id == "3739089000222605568")
|
||||
{
|
||||
|
||||
}
|
||||
IsRefund = GetIsRefund();
|
||||
IsEmergency = GetIsEmergency();
|
||||
IsDistribReturnOrder = GetIsDistribReturnOrder();
|
||||
IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder;
|
||||
IsEmergencyManualReturnOrder = IsEmergency && !IsDistribReturnOrder;
|
||||
IsAbnormal = GetIsAbnormal();
|
||||
|
||||
if (IsWaitBuy/* || IsWaitSend*/)
|
||||
@@ -760,7 +726,11 @@ namespace AllBase.Model.DBModel
|
||||
IsShowTransitExtraPackagesBtn = false;
|
||||
else
|
||||
IsShowTransitExtraPackagesBtn = true;
|
||||
}
|
||||
|
||||
SetDeliveryDeadlineStatusStr();
|
||||
SetOutExpressNo();
|
||||
SetShipDoneTimeStr();
|
||||
}
|
||||
|
||||
public bool GetIsWaitBuy()
|
||||
{
|
||||
@@ -817,11 +787,6 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
private bool GetIsWaitReceive()
|
||||
{
|
||||
if (order_id == "3738622310043515392")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
if (refundItems?.Any(r => r.IsRefund) == true)
|
||||
return false;
|
||||
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
@@ -833,11 +798,6 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
public bool GetIsAbnormal()
|
||||
{
|
||||
if (order_id == "3739720775494980096")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// 三退或者两退,为退款完成单
|
||||
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
|
||||
// (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
|
||||
@@ -870,5 +830,41 @@ namespace AllBase.Model.DBModel
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool GetIsRefund()
|
||||
{
|
||||
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
|
||||
if (!orderItems.Any(oi => oi.refund_status > 1))
|
||||
return false;
|
||||
if (GetIsEmergency())
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool GetIsEmergency()
|
||||
{
|
||||
// 微信订单退货中
|
||||
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
// 微信订单退款中或退款成功,但是买手订单未完成退款
|
||||
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool GetIsDistribReturnOrder()
|
||||
{
|
||||
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user