Browse Source

Rename to "UnpaidAutoCancellationReason"

pull/164/head
gdlcf88 4 years ago
parent
commit
6c5efd2810
  1. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/OrdersConsts.cs
  2. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderAutoCancelOnUpdatedHandler.cs
  3. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/UnpaidOrderAutoCancelJob.cs
  4. 12
      modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs

2
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";
}
}

2
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);
}
}
}

2
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);
}
}
}

12
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);
});
}

Loading…
Cancel
Save