Removed OrderStatus string definitions

services/ordering/src/EShopOnAbp.OrderingService.Application.Contracts/Orders/OrderDto.cs

@@ -8,7 +8,7 @@ public class OrderDto : EntityDto<Guid>
 {
     public DateTime OrderDate { get; set; }
     public int OrderNo { get; set; }
-    public string OrderStatus { get; set; }
+    public OrderStatus OrderStatus { get; set; }
     public string PaymentMethod { get; set; }
     public BuyerDto Buyer { get; set; }
     public OrderAddressDto Address { get; set; } = new();

services/ordering/src/EShopOnAbp.OrderingService.Application/Orders/OrderAppService.cs

@@ -106,7 +106,7 @@ public class OrderAppService : ApplicationService, IOrderAppService
             Id = order.Id,
             OrderNo = order.OrderNo,
             OrderDate = order.OrderDate,
-            OrderStatus = order.OrderStatus.ToString(),
+            OrderStatus = order.OrderStatus,
             PaymentMethod = order.PaymentMethod
         };
     }

services/ordering/src/EShopOnAbp.OrderingService.EntityFrameworkCore/EntityFrameworkCore/OrderingServiceDbContext.cs

@@ -2,8 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using System;
-using System.Data;
-using System.Reflection.Emit;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -20,17 +18,17 @@ public class OrderingServiceDbContext : AbpDbContext<OrderingServiceDbContext>,
     {
     }
 
-    protected override void OnModelCreating(ModelBuilder builder)
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        base.OnModelCreating(builder);
+        base.OnModelCreating(modelBuilder);
 
         /* Include modules to your migration db context */
 
-        builder.ConfigureOrderingService();
+        modelBuilder.ConfigureOrderingService();
         /* Configure your own tables/entities inside here */
 
 
-        builder.Entity<Order>(b =>
+        modelBuilder.Entity<Order>(b =>
         {
             b.ToTable(OrderingServiceDbProperties.DbTablePrefix + "Orders", OrderingServiceDbProperties.DbSchema);
             b.ConfigureByConvention(); //auto configure for the base class props
@@ -43,16 +41,10 @@ public class OrderingServiceDbContext : AbpDbContext<OrderingServiceDbContext>,
 
             b.Navigation(q => q.OrderItems).UsePropertyAccessMode(PropertyAccessMode.Property);
 
-            b.Property(q => q.OrderStatus).HasConversion<string>();
-            
-            //b.Property(e => e.OrderStatus).HasConversion(
-            //    v => v.ToString(),
-            //    v => (OrderStatus)Enum.Parse(typeof(OrderStatus), v));
+            b.Property(q => q.OrderStatus).HasConversion(new EnumToStringConverter<OrderStatus>());
         });
 
-       
-
-        builder.Entity<OrderItem>(b =>
+        modelBuilder.Entity<OrderItem>(b =>
         {
             b.ToTable(OrderingServiceDbProperties.DbTablePrefix + "OrderItems",
                 OrderingServiceDbProperties.DbSchema);