Rename cancelled to canceled

Upgrade PaymentService module to version 0.4.3
6 years ago · 551b4be898
38 changed files with 3713 additions and 48 deletions
--- a/integration/EasyAbp.EShop/common.props
+++ b/integration/EasyAbp.EShop/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/modules/EasyAbp.EShop.Baskets/common.props
+++ b/modules/EasyAbp.EShop.Baskets/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/modules/EasyAbp.EShop.Orders/common.props
+++ b/modules/EasyAbp.EShop.Orders/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderDto.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application.Contracts/EasyAbp/EShop/Orders/Orders/Dtos/OrderDto.cs
@ -34,7 +34,7 @@ namespace EasyAbp.EShop.Orders.Orders.Dtos

        public DateTime? CompletionTime { get; set; }

-        public DateTime? CancelledTime { get; set; }
+        public DateTime? CanceledTime { get; set; }
        
        public DateTime? ReducedInventoryAfterPlacingTime { get; set; }
        
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/cs.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/cs.json
@ -16,7 +16,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/en.json
@ -17,7 +17,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pl.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pl.json
@ -16,7 +16,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pt-BR.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/pt-BR.json
@ -16,7 +16,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/sl.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/sl.json
@ -17,7 +17,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/tr.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/tr.json
@ -17,7 +17,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/vi.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/vi.json
@ -16,7 +16,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hans.json
@ -17,7 +17,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Localization/Orders/zh-Hant.json
@ -17,7 +17,7 @@
    "OrderStaffRemark": "OrderStaffRemark",
    "OrderPaidTime": "OrderPaidTime",
    "OrderCompletionTime": "OrderCompletionTime",
-    "OrderCancelledTime": "OrderCancelledTime",
+    "OrderCanceledTime": "OrderCanceledTime",
    "OrderLine": "OrderLine",
    "OrderLineProductId": "OrderLineProductId",
    "OrderLineProductSkuId": "OrderLineProductSkuId",
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderEto.cs
@ -36,7 +36,7 @@ namespace EasyAbp.EShop.Orders.Orders

        public DateTime? CompletionTime { get; set; }

-        public DateTime? CancelledTime { get; set; }
+        public DateTime? CanceledTime { get; set; }

        public List<OrderLineEto> OrderLines { get; set; }
    }
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderStatus.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain.Shared/EasyAbp/EShop/Orders/Orders/OrderStatus.cs
@ -8,6 +8,6 @@ namespace EasyAbp.EShop.Orders.Orders
        Pending = 1,
        Processing = 2,
        Completed = 4,
-        Cancelled = 8
+        Canceled = 8
    }
 }
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" />
    <ProjectReference Include="..\..\..\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/Order.cs
@ -43,7 +43,7 @@ namespace EasyAbp.EShop.Orders.Orders
        
        public virtual DateTime? CompletionTime { get; protected set; }
        
-        public virtual DateTime? CancelledTime { get; protected set; }
+        public virtual DateTime? CanceledTime { get; protected set; }
        
        public virtual DateTime? ReducedInventoryAfterPlacingTime { get; protected set; }
        
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp/EShop/Orders/Orders/OrderPaymentCompletedEventHandler.cs
@ -42,7 +42,7 @@ namespace EasyAbp.EShop.Orders.Orders
        {
            var payment = eventData.Payment;
            
-            if (!payment.CompletionTime.HasValue || payment.CancelledTime.HasValue)
+            if (!payment.CompletionTime.HasValue || payment.CanceledTime.HasValue)
            {
                return;
            }
--- a/modules/EasyAbp.EShop.Payments/common.props
+++ b/modules/EasyAbp.EShop.Payments/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentDto.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp/EShop/Payments/Payments/Dtos/PaymentDto.cs
@ -26,7 +26,7 @@ namespace EasyAbp.EShop.Payments.Payments.Dtos

        public DateTime? CompletionTime { get; set; }
        
-        public DateTime? CancelledTime { get; set; }
+        public DateTime? CanceledTime { get; set; }

        public List<PaymentItemDto> PaymentItems { get; set; }
    }
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" />
    <ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/Payment.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Payments/Payment.cs
@ -39,7 +39,7 @@ namespace EasyAbp.EShop.Payments.Payments

        public virtual DateTime? CompletionTime { get; protected set; }
        
-        public virtual DateTime? CancelledTime { get; protected set; }
+        public virtual DateTime? CanceledTime { get; protected set; }
        
        public virtual List<PaymentItem> PaymentItems { get; protected set; }
        
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/Refund.cs
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp/EShop/Payments/Refunds/Refund.cs
@ -34,7 +34,7 @@ namespace EasyAbp.EShop.Payments.Refunds

        public virtual DateTime? CompletedTime { get; protected set; }
        
-        public virtual DateTime? CancelledTime { get; protected set; }
+        public virtual DateTime? CanceledTime { get; protected set; }

        #endregion
        
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml
@ -56,7 +56,7 @@
                <th>@L["PaymentActualPaymentAmount"]</th>
                <th>@L["PaymentRefundAmount"]</th>
                <th>@L["PaymentCompletionTime"]</th>
-                <th>@L["PaymentCancelledTime"]</th>
+                <th>@L["PaymentCanceledTime"]</th>
            </tr>
            </thead>
        </abp-table>
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.js
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/index.js
@ -35,7 +35,7 @@ $(function () {
            { data: "actualPaymentAmount" },
            { data: "refundAmount" },
            { data: "completionTime" },
-            { data: "cancelledTime" },
+            { data: "canceledTime" },
        ]
    }));
 });
--- a/modules/EasyAbp.EShop.Products/common.props
+++ b/modules/EasyAbp.EShop.Products/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/modules/EasyAbp.EShop.Stores/common.props
+++ b/modules/EasyAbp.EShop.Stores/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
@ -13,8 +13,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.ObjectExtending" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
@ -14,8 +14,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Application" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Application" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.Account.Application" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Identity.Application" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
@ -13,8 +13,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.4.3" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
    <PackageReference Include="Volo.Abp.Identity.Domain" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200627172358_RenamedCancelledToCanceled.Designer.cs
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200627172358_RenamedCancelledToCanceled.Designer.cs
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200627172358_RenamedCancelledToCanceled.cs
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200627172358_RenamedCancelledToCanceled.cs
@ -0,0 +1,64 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace EShopSample.Migrations
+{
+    public partial class RenamedCancelledToCanceled : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "CancelledTime",
+                table: "PaymentServiceRefunds",
+                newName: "CanceledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CancelledTime",
+                table: "PaymentServicePayments",
+                newName: "CanceledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CancelledTime",
+                table: "EShopPaymentsRefunds",
+                newName: "CanceledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CancelledTime",
+                table: "EShopPaymentsPayments",
+                newName: "CanceledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CancelledTime",
+                table: "EShopOrdersOrders",
+                newName: "CanceledTime");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "CanceledTime",
+                table: "PaymentServiceRefunds",
+                newName: "CancelledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CanceledTime",
+                table: "PaymentServicePayments",
+                newName: "CancelledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CanceledTime",
+                table: "EShopPaymentsRefunds",
+                newName: "CancelledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CanceledTime",
+                table: "EShopPaymentsPayments",
+                newName: "CancelledTime");
+
+            migrationBuilder.RenameColumn(
+                name: "CanceledTime",
+                table: "EShopOrdersOrders",
+                newName: "CancelledTime");
+        }
+    }
+}
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs
@ -27,7 +27,7 @@ namespace EShopSample.Migrations
                        .ValueGeneratedOnAdd()
                        .HasColumnType("uniqueidentifier");

-                    b.Property<DateTime?>("CancelledTime")
+                    b.Property<DateTime?>("CanceledTime")
                        .HasColumnType("datetime2");

                    b.Property<DateTime?>("CompletionTime")
@ -221,7 +221,7 @@ namespace EShopSample.Migrations
                    b.Property<decimal>("ActualPaymentAmount")
                        .HasColumnType("decimal(20,8)");

-                    b.Property<DateTime?>("CancelledTime")
+                    b.Property<DateTime?>("CanceledTime")
                        .HasColumnType("datetime2");

                    b.Property<DateTime?>("CompletionTime")
@ -381,7 +381,7 @@ namespace EShopSample.Migrations
                        .ValueGeneratedOnAdd()
                        .HasColumnType("uniqueidentifier");

-                    b.Property<DateTime?>("CancelledTime")
+                    b.Property<DateTime?>("CanceledTime")
                        .HasColumnType("datetime2");

                    b.Property<DateTime?>("CompletedTime")
@ -1166,7 +1166,7 @@ namespace EShopSample.Migrations
                    b.Property<decimal>("ActualPaymentAmount")
                        .HasColumnType("decimal(18,6)");

-                    b.Property<DateTime?>("CancelledTime")
+                    b.Property<DateTime?>("CanceledTime")
                        .HasColumnType("datetime2");

                    b.Property<DateTime?>("CompletionTime")
@ -1323,7 +1323,7 @@ namespace EShopSample.Migrations
                        .ValueGeneratedOnAdd()
                        .HasColumnType("uniqueidentifier");

-                    b.Property<DateTime?>("CancelledTime")
+                    b.Property<DateTime?>("CanceledTime")
                        .HasColumnType("datetime2");

                    b.Property<DateTime?>("CompletedTime")
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
@ -10,8 +10,8 @@
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" />
    <ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
-    <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
@ -13,8 +13,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
@ -13,8 +13,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.Account.HttpApi" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.9.0" />
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
@ -45,8 +45,8 @@
    <ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" />
    <ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" />
    <ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
-    <PackageReference Include="EasyAbp.PaymentService.Web" Version="0.4.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.4.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Web" Version="0.4.3" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.4.3" />
    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" />
    <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.9.0" />