From 365f9d8a945300aa73221801c94e1f7a5dd224ef Mon Sep 17 00:00:00 2001 From: zzh <1368735060@qq.com> Date: Tue, 21 Jul 2026 17:37:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E5=80=BC=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E4=BB=8E=201=20=E8=B5=B7=E7=BC=96=E5=B9=B6=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=20OrderTaskStatus=20=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reserve 0 as None for byte enums and align customer group labels with dict codes; add OrderTaskStatusCodes for import task status strings. Co-authored-by: Cursor --- .../DataPerm/DataPermConstants.cs | 12 ++++----- .../Services/Orders/OrderService.Helpers.cs | 6 ++--- .../CustomersAggregate/Enums/CustomerGroup.cs | 16 +++++++----- .../Enums/CustomerStatus.cs | 10 ++++--- .../Consts/OrderTaskStatusCodes.cs | 26 +++++++++++++++++++ .../RechargeAggregate/Enums/PayType.cs | 4 +++ .../RechargeAggregate/Enums/RechargeStatus.cs | 10 ++++--- src/Oms.Domain/Shared/Enums/EnableStatus.cs | 8 ++++-- 8 files changed, 69 insertions(+), 23 deletions(-) create mode 100644 src/Oms.Domain/OrdersAggregate/Consts/OrderTaskStatusCodes.cs diff --git a/src/Oms.Application/DataPerm/DataPermConstants.cs b/src/Oms.Application/DataPerm/DataPermConstants.cs index b1b4b3d..9c07a43 100644 --- a/src/Oms.Application/DataPerm/DataPermConstants.cs +++ b/src/Oms.Application/DataPerm/DataPermConstants.cs @@ -66,11 +66,11 @@ public static class DataPermConstants public static readonly IReadOnlyList<(int Value, string Label)> CustomerGroupOptions = [ - (0, "默认"), - (1, "VIP"), - (2, "重点"), - (3, "普通"), - (4, "试用"), - (5, "停用") + (1, "普通客户"), + (2, "VIP1"), + (3, "VIP2"), + (4, "VIP3"), + (5, "VIP4"), + (6, "VIP5") ]; } diff --git a/src/Oms.Application/Services/Orders/OrderService.Helpers.cs b/src/Oms.Application/Services/Orders/OrderService.Helpers.cs index cf1e869..1f4c09c 100644 --- a/src/Oms.Application/Services/Orders/OrderService.Helpers.cs +++ b/src/Oms.Application/Services/Orders/OrderService.Helpers.cs @@ -384,7 +384,7 @@ public partial class OrderService Quantity = parsedRows.Count, SuccessCount = 0, FailCount = 0, - Status = "processing", + Status = OrderTaskStatusCodes.Processing, TemplateId = template.Id, CustomerId = effectiveCustomer.Id }); @@ -456,7 +456,7 @@ public partial class OrderService Quantity = 0, SuccessCount = 0, FailCount = 0, - Status = "processing", + Status = OrderTaskStatusCodes.Processing, TemplateId = template.Id, CustomerId = effectiveCustomer.Id }); @@ -500,7 +500,7 @@ public partial class OrderService task.Quantity = quantity; task.SuccessCount = successCount; task.FailCount = failCount; - task.Status = "completed"; + task.Status = OrderTaskStatusCodes.Completed; await OrderTaskRepository.UpdateAsync(task); return new OrderUploadOutput { TaskId = task.Id }; } diff --git a/src/Oms.Domain/CustomersAggregate/Enums/CustomerGroup.cs b/src/Oms.Domain/CustomersAggregate/Enums/CustomerGroup.cs index 198ab7e..a92de3a 100644 --- a/src/Oms.Domain/CustomersAggregate/Enums/CustomerGroup.cs +++ b/src/Oms.Domain/CustomersAggregate/Enums/CustomerGroup.cs @@ -1,11 +1,15 @@ namespace Oms.Domain.CustomersAggregate.Enums; +/// +/// 客户组。0=None 未设置；业务值从 1 起。 +/// public enum CustomerGroup : byte { - Normal = 0, - Vip1 = 1, - Vip2 = 2, - Vip3 = 3, - Vip4 = 4, - Vip5 = 5 + None = 0, + Normal = 1, + Vip1 = 2, + Vip2 = 3, + Vip3 = 4, + Vip4 = 5, + Vip5 = 6 } diff --git a/src/Oms.Domain/CustomersAggregate/Enums/CustomerStatus.cs b/src/Oms.Domain/CustomersAggregate/Enums/CustomerStatus.cs index 465cc46..bb59aa2 100644 --- a/src/Oms.Domain/CustomersAggregate/Enums/CustomerStatus.cs +++ b/src/Oms.Domain/CustomersAggregate/Enums/CustomerStatus.cs @@ -1,8 +1,12 @@ namespace Oms.Domain.CustomersAggregate.Enums; +/// +/// 客户状态。0=None 未设置；业务值从 1 起。 +/// public enum CustomerStatus : byte { - Disabled = 0, - Normal = 1, - Frozen = 2 + None = 0, + Disabled = 1, + Normal = 2, + Frozen = 3 } diff --git a/src/Oms.Domain/OrdersAggregate/Consts/OrderTaskStatusCodes.cs b/src/Oms.Domain/OrdersAggregate/Consts/OrderTaskStatusCodes.cs new file mode 100644 index 0000000..54ffb85 --- /dev/null +++ b/src/Oms.Domain/OrdersAggregate/Consts/OrderTaskStatusCodes.cs @@ -0,0 +1,26 @@ +namespace Oms.Domain.OrdersAggregate.Consts; + +/// +/// 订单导入/批量任务状态（t_order_task.Status，字符串落库；与字典 order_task_status 对齐）。 +/// +public static class OrderTaskStatusCodes +{ + public const string Pending = "pending"; + public const string Processing = "processing"; + public const string Completed = "completed"; + + public static readonly HashSet All = new(StringComparer.OrdinalIgnoreCase) + { + Pending, + Processing, + Completed + }; + + public static string GetDisplayName(string? code) => code?.Trim().ToLowerInvariant() switch + { + Pending => "待处理", + Processing => "处理中", + Completed => "已完成", + _ => code ?? string.Empty + }; +} diff --git a/src/Oms.Domain/RechargeAggregate/Enums/PayType.cs b/src/Oms.Domain/RechargeAggregate/Enums/PayType.cs index 3aed3ab..3ef6adf 100644 --- a/src/Oms.Domain/RechargeAggregate/Enums/PayType.cs +++ b/src/Oms.Domain/RechargeAggregate/Enums/PayType.cs @@ -1,7 +1,11 @@ namespace Oms.Domain.RechargeAggregate.Enums; +/// +/// 支付方式。0=None 未设置；业务值从 1 起。 +/// public enum PayType : byte { + None = 0, Wechat = 1, Alipay = 2 } diff --git a/src/Oms.Domain/RechargeAggregate/Enums/RechargeStatus.cs b/src/Oms.Domain/RechargeAggregate/Enums/RechargeStatus.cs index 4fbf9cb..edd3918 100644 --- a/src/Oms.Domain/RechargeAggregate/Enums/RechargeStatus.cs +++ b/src/Oms.Domain/RechargeAggregate/Enums/RechargeStatus.cs @@ -1,8 +1,12 @@ namespace Oms.Domain.RechargeAggregate.Enums; +/// +/// 充值审核状态。0=None 未设置；业务值从 1 起。 +/// public enum RechargeStatus : byte { - Pending = 0, - Approved = 1, - Rejected = 2 + None = 0, + Pending = 1, + Approved = 2, + Rejected = 3 } diff --git a/src/Oms.Domain/Shared/Enums/EnableStatus.cs b/src/Oms.Domain/Shared/Enums/EnableStatus.cs index 1e88adb..c48abbd 100644 --- a/src/Oms.Domain/Shared/Enums/EnableStatus.cs +++ b/src/Oms.Domain/Shared/Enums/EnableStatus.cs @@ -1,7 +1,11 @@ namespace Oms.Domain.Shared.Enums; +/// +/// 启用状态。0=None 未设置；业务值从 1 起。 +/// public enum EnableStatus : byte { - Disabled = 0, - Enabled = 1 + None = 0, + Disabled = 1, + Enabled = 2 }