chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

需要售后订单处理逻辑优化调整及bug修复

Browse Source
This commit is contained in:
wule committed 2026-08-27 08:55:53 +08:00
1 parent 854e10ed1a
commit 237fad81eb
9 files changed
+299 -189
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_order_info.cs
+9 -8
View File
@@ -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
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+2 -2
View File
@@ -305,8 +305,8 @@ namespace AllBase.Model.DBModel
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
AddEditTransitWarehouseAfterSaleStr = "";
}
// 退货退款的，不能中转仓退回。如果是退到退货仓，则退货仓流程，否则店家自行收货退回总店。
}
// 退货退款的，不能拦截退回总店。如果是退到退货仓，则退货仓流程，否则店家自行收货退回总店。
if (!RefundAddressStr.ParseToString().Trim().IsNullOrEmpty() || this.ItemRefund?.type != "REFUND")
{
if (AddEditTransitWarehouseAfterSaleStr != "已添加")