From 6c5efd281009a6bf83bde423bb4b3b5d49ba794f Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Sun, 12 Jun 2022 04:05:30 +0800 Subject: [PATCH] Rename to "UnpaidAutoCancellationReason" --- .../EasyAbp/EShop/Orders/OrdersConsts.cs | 2 +- .../Orders/Orders/OrderAutoCancelOnUpdatedHandler.cs | 2 +- .../EShop/Orders/Orders/UnpaidOrderAutoCancelJob.cs | 2 +- .../Orders/OrderAppServiceTests.cs | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/OrdersConsts.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/OrdersConsts.cs index 051299d7..df729533 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/OrdersConsts.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/OrdersConsts.cs @@ -2,6 +2,6 @@ { public static class OrdersConsts { - public static string CancellationReason = "Order payment timed out and not paid"; + public static string UnpaidAutoCancellationReason = "Order payment timed out and not paid"; } } \ No newline at end of file diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderAutoCancelOnUpdatedHandler.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderAutoCancelOnUpdatedHandler.cs index 93d77f0d..7297e668 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderAutoCancelOnUpdatedHandler.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderAutoCancelOnUpdatedHandler.cs @@ -32,7 +32,7 @@ namespace EasyAbp.EShop.Orders.Orders if (_clock.Now > eventData.Entity.PaymentExpiration.Value && !eventData.Entity.CanceledTime.HasValue) { - await _orderManager.CancelAsync(eventData.Entity, OrdersConsts.CancellationReason); + await _orderManager.CancelAsync(eventData.Entity, OrdersConsts.UnpaidAutoCancellationReason); } } } diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/UnpaidOrderAutoCancelJob.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/UnpaidOrderAutoCancelJob.cs index 7fd78888..71b26ac1 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/UnpaidOrderAutoCancelJob.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/UnpaidOrderAutoCancelJob.cs @@ -46,7 +46,7 @@ namespace EasyAbp.EShop.Orders.Orders } else { - await _orderManager.CancelAsync(order, OrdersConsts.CancellationReason); + await _orderManager.CancelAsync(order, OrdersConsts.UnpaidAutoCancellationReason); } } } diff --git a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs index 665890e8..18e5b70b 100644 --- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs +++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs @@ -289,7 +289,7 @@ namespace EasyAbp.EShop.Orders.Orders response.PaymentExpiration.ShouldBe(now); response.OrderStatus.ShouldBe(OrderStatus.Canceled); response.CanceledTime.ShouldNotBeNull(); - response.CancellationReason.ShouldBe(OrdersConsts.CancellationReason); + response.CancellationReason.ShouldBe(OrdersConsts.UnpaidAutoCancellationReason); UsingDbContext(db => { @@ -299,7 +299,7 @@ namespace EasyAbp.EShop.Orders.Orders order.PaymentExpiration.ShouldBe(now); order.OrderStatus.ShouldBe(OrderStatus.Canceled); order.CanceledTime.ShouldNotBeNull(); - order.CancellationReason.ShouldBe(OrdersConsts.CancellationReason); + order.CancellationReason.ShouldBe(OrdersConsts.UnpaidAutoCancellationReason); }); } @@ -403,7 +403,7 @@ namespace EasyAbp.EShop.Orders.Orders response.PaymentExpiration.ShouldBe(now); response.OrderStatus.ShouldBe(OrderStatus.Canceled); response.CanceledTime.ShouldNotBeNull(); - response.CancellationReason.ShouldBe(OrdersConsts.CancellationReason); + response.CancellationReason.ShouldBe(OrdersConsts.UnpaidAutoCancellationReason); UsingDbContext(db => { @@ -413,7 +413,7 @@ namespace EasyAbp.EShop.Orders.Orders order.PaymentExpiration.ShouldBe(now); order.OrderStatus.ShouldBe(OrderStatus.Canceled); order.CanceledTime.ShouldNotBeNull(); - order.CancellationReason.ShouldBe(OrdersConsts.CancellationReason); + order.CancellationReason.ShouldBe(OrdersConsts.UnpaidAutoCancellationReason); }); } @@ -460,7 +460,7 @@ namespace EasyAbp.EShop.Orders.Orders response.PaymentExpiration.ShouldBe(now); response.OrderStatus.ShouldBe(OrderStatus.Canceled); response.CanceledTime.ShouldNotBeNull(); - response.CancellationReason.ShouldBe(OrdersConsts.CancellationReason); + response.CancellationReason.ShouldBe(OrdersConsts.UnpaidAutoCancellationReason); UsingDbContext(db => { @@ -470,7 +470,7 @@ namespace EasyAbp.EShop.Orders.Orders order.PaymentExpiration.ShouldBe(now); order.OrderStatus.ShouldBe(OrderStatus.Canceled); order.CanceledTime.ShouldNotBeNull(); - order.CancellationReason.ShouldBe(OrdersConsts.CancellationReason); + order.CancellationReason.ShouldBe(OrdersConsts.UnpaidAutoCancellationReason); }); }