需要售后订单处理逻辑优化调整及bug修复
This commit is contained in:
1 parent
854e10ed1a
commit
237fad81eb
9 files changed
+299
-189
No files matched your search
@@ -133,7 +133,8 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
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 => !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);
|
||||
}
|
||||
set { }
|
||||
}
|
||||
@@ -213,7 +214,7 @@ namespace AllBase.Model.DBModel
|
||||
/// <summary>
|
||||
/// 订单总状态文本
|
||||
/// </summary>
|
||||
public string DeliveryDeadlineDtatusStr
|
||||
public string DeliveryDeadlineStatusStr
|
||||
{
|
||||
get
|
||||
{
|
||||
@@ -264,9 +265,9 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
get
|
||||
{
|
||||
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||
if (DeliveryDeadlineStatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||
return new SolidColorBrush(Color.FromRgb(250, 71, 51)); // #fa4733
|
||||
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||
else if (DeliveryDeadlineStatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||
return new SolidColorBrush(Color.FromRgb(103, 194, 58)); // #67c23a
|
||||
else
|
||||
return new SolidColorBrush(Color.FromRgb(3, 151, 181)); // #0397b5
|
||||
@@ -277,9 +278,9 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
get
|
||||
{
|
||||
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||
if (DeliveryDeadlineStatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||
return new SolidColorBrush(Color.FromArgb(26, 250, 71, 51)); // #fa4733 0.2
|
||||
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||
else if (DeliveryDeadlineStatusStr == "退款完成" || 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
|
||||
@@ -290,9 +291,9 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
get
|
||||
{
|
||||
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||
if (DeliveryDeadlineStatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||
return new SolidColorBrush(Color.FromArgb(50, 250, 71, 51)); // #fa4733 0.2
|
||||
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||
else if (DeliveryDeadlineStatusStr == "退款完成" || 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
|
||||
|
||||
Reference in new issue
Block a user