Add ExpirationTime to Coupon entity

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Application.Contracts/EasyAbp/EShop/Plugins/Coupons/Coupons/Dtos/CouponDto.cs

@@ -12,10 +12,8 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons.Dtos
 
         public Guid? OrderId { get; set; }
 
-        public DateTime? UsableBeginTime { get; set; }
-
-        public DateTime? UsableEndTime { get; set; }
-
+        public DateTime? ExpirationTime { get; set; }
+        
         public DateTime? UsedTime { get; set; }
 
         public decimal? DiscountedAmount { get; set; }

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/pl-PL.json

@@ -29,8 +29,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/pt-BR.json

@@ -29,8 +29,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/sl.json

@@ -30,8 +30,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/tr.json

@@ -31,8 +31,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/vi.json

@@ -29,8 +29,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/zh-Hans.json

@@ -30,8 +30,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain.Shared/EasyAbp/EShop/Plugins/Coupons/Localization/zh-Hant.json

@@ -30,8 +30,7 @@
     "CouponCouponTemplateId": "CouponCouponTemplateId",
     "CouponUserId": "CouponUserId",
     "CouponOrderId": "CouponOrderId",
-    "CouponUsableBeginTime": "CouponUsableBeginTime",
-    "CouponUsableEndTime": "CouponUsableEndTime",
+    "CouponExpirationTime": "CouponExpirationTime",
     "CouponUsedTime": "CouponUsedTime",
     "CouponDiscountedAmount": "CouponDiscountedAmount",
     "CreateCoupon": "CreateCoupon",

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Domain/EasyAbp/EShop/Plugins/Coupons/Coupons/Coupon.cs

@@ -4,7 +4,7 @@ using Volo.Abp.MultiTenancy;
 
 namespace EasyAbp.EShop.Plugins.Coupons.Coupons
 {
-    public class Coupon : FullAuditedAggregateRoot<Guid>, IMultiTenant
+    public class Coupon : FullAuditedAggregateRoot<Guid>, ICoupon, IMultiTenant
     {
         public virtual Guid? TenantId { get; protected set; }
         
@@ -13,11 +13,9 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons
         public virtual Guid UserId { get; protected set; }
         
         public virtual Guid? OrderId { get; protected set; }
-        
-        public virtual DateTime? UsableBeginTime { get; protected set; }
-        
-        public virtual DateTime? UsableEndTime { get; protected set; }
-        
+
+        public virtual DateTime? ExpirationTime { get; protected set; }
+
         public virtual DateTime? UsedTime { get; protected set; }
         
         public virtual decimal? DiscountedAmount { get; protected set; }
@@ -31,19 +29,18 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons
             Guid? tenantId, 
             Guid couponTemplateId, 
             Guid userId, 
-            Guid? orderId, 
-            DateTime? usableBeginTime, 
-            DateTime? usableEndTime, 
-            DateTime? usedTime, 
-            decimal? discountedAmount
-        ) : base(id)
+            Guid? orderId,
+            DateTime? expirationTime) : base(id)
         {
             TenantId = tenantId;
             CouponTemplateId = couponTemplateId;
             UserId = userId;
             OrderId = orderId;
-            UsableBeginTime = usableBeginTime;
-            UsableEndTime = usableEndTime;
+            ExpirationTime = expirationTime;
+        }
+
+        public void Use(DateTime? usedTime, decimal? discountedAmount)
+        {
             UsedTime = usedTime;
             DiscountedAmount = discountedAmount;
         }

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Pages/EShop/Plugins/Coupons/Coupons/Coupon/Index.cshtml

@@ -50,8 +50,7 @@
                 <th>@L["CouponCouponTemplateId"]</th>
                 <th>@L["CouponUserId"]</th>
                 <th>@L["CouponOrderId"]</th>
-                <th>@L["CouponUsableBeginTime"]</th>
-                <th>@L["CouponUsableEndTime"]</th>
+                <th>@L["CouponExpirationTime"]</th>
                 <th>@L["CouponUsedTime"]</th>
                 <th>@L["CouponDiscountedAmount"]</th>
             </tr>

plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Pages/EShop/Plugins/Coupons/Coupons/Coupon/index.js

@@ -47,8 +47,7 @@ $(function () {
             { data: "couponTemplateId" },
             { data: "userId" },
             { data: "orderId" },
-            { data: "usableBeginTime" },
-            { data: "usableEndTime" },
+            { data: "expirationTime" },
             { data: "usedTime" },
             { data: "discountedAmount" },
         ]

samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200924083357_RemovedUsableTimePropertiesFromCoupon.cs

@@ -0,0 +1,34 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace EShopSample.Migrations
+{
+    public partial class RemovedUsableTimePropertiesFromCoupon : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UsableBeginTime",
+                table: "EasyAbpEShopPluginsCouponsCoupons");
+
+            migrationBuilder.DropColumn(
+                name: "UsableEndTime",
+                table: "EasyAbpEShopPluginsCouponsCoupons");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UsableBeginTime",
+                table: "EasyAbpEShopPluginsCouponsCoupons",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UsableEndTime",
+                table: "EasyAbpEShopPluginsCouponsCoupons",
+                type: "datetime2",
+                nullable: true);
+        }
+    }
+}

samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200924084245_AddExpirationTimeToCoupon.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace EShopSample.Migrations
+{
+    public partial class AddExpirationTimeToCoupon : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ExpirationTime",
+                table: "EasyAbpEShopPluginsCouponsCoupons",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExpirationTime",
+                table: "EasyAbpEShopPluginsCouponsCoupons");
+        }
+    }
+}

samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs

@@ -910,6 +910,9 @@ namespace EShopSample.Migrations
                     b.Property<decimal?>("DiscountedAmount")
                         .HasColumnType("decimal(20,8)");
 
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnName("ExtraProperties")
                         .HasColumnType("nvarchar(max)");
@@ -935,12 +938,6 @@ namespace EShopSample.Migrations
                         .HasColumnName("TenantId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<DateTime?>("UsableBeginTime")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("UsableEndTime")
-                        .HasColumnType("datetime2");
-
                     b.Property<DateTime?>("UsedTime")
                         .HasColumnType("datetime2");