Browse Source

Update EF configurations and add migrations for the sample app

pull/146/head
gdlcf88 4 years ago
parent
commit
199ac9dfd6
  1. 1
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/EntityFrameworkCore/OrdersDbContextModelCreatingExtensions.cs
  2. 8
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
  3. 5171
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220420080940_OrderExtraFeesRefund.Designer.cs
  4. 55
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220420080940_OrderExtraFeesRefund.cs
  5. 39
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/EShopSampleDbContextModelSnapshot.cs

1
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.EntityFrameworkCore/EasyAbp/EShop/Orders/EntityFrameworkCore/OrdersDbContextModelCreatingExtensions.cs

@ -72,6 +72,7 @@ namespace EasyAbp.EShop.Orders.EntityFrameworkCore
b.ConfigureByConvention();
/* Configure more properties here */
b.Property(x => x.Fee).HasColumnType("decimal(20,8)");
b.Property(x => x.RefundAmount).HasColumnType("decimal(20,8)");
b.HasKey(x => new {x.OrderId, x.Name, x.Key});
});
}

8
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.EntityFrameworkCore/EasyAbp/EShop/Payments/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs

@ -89,6 +89,14 @@ namespace EasyAbp.EShop.Payments.EntityFrameworkCore
/* Configure more properties here */
b.Property(x => x.RefundAmount).HasColumnType("decimal(20,8)");
});
builder.Entity<RefundItemOrderExtraFee>(b =>
{
b.ToTable(options.TablePrefix + "RefundItemOrderExtraFees", options.Schema);
b.ConfigureByConvention();
/* Configure more properties here */
b.Property(x => x.RefundAmount).HasColumnType("decimal(20,8)");
});
}
}
}

5171
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220420080940_OrderExtraFeesRefund.Designer.cs

File diff suppressed because it is too large

55
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/20220420080940_OrderExtraFeesRefund.cs

@ -0,0 +1,55 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EShopSample.Migrations
{
public partial class OrderExtraFeesRefund : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<decimal>(
name: "RefundAmount",
table: "EasyAbpEShopOrdersOrderExtraFees",
type: "decimal(20,8)",
nullable: false,
defaultValue: 0m);
migrationBuilder.CreateTable(
name: "EasyAbpEShopPaymentsRefundItemOrderExtraFees",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Name = table.Column<string>(type: "nvarchar(max)", nullable: true),
Key = table.Column<string>(type: "nvarchar(max)", nullable: true),
RefundAmount = table.Column<decimal>(type: "decimal(20,8)", nullable: false),
RefundItemId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_EasyAbpEShopPaymentsRefundItemOrderExtraFees", x => x.Id);
table.ForeignKey(
name: "FK_EasyAbpEShopPaymentsRefundItemOrderExtraFees_EasyAbpEShopPaymentsRefundItems_RefundItemId",
column: x => x.RefundItemId,
principalTable: "EasyAbpEShopPaymentsRefundItems",
principalColumn: "Id");
});
migrationBuilder.CreateIndex(
name: "IX_EasyAbpEShopPaymentsRefundItemOrderExtraFees_RefundItemId",
table: "EasyAbpEShopPaymentsRefundItemOrderExtraFees",
column: "RefundItemId");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "EasyAbpEShopPaymentsRefundItemOrderExtraFees");
migrationBuilder.DropColumn(
name: "RefundAmount",
table: "EasyAbpEShopOrdersOrderExtraFees");
}
}
}

39
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/Migrations/EShopSampleDbContextModelSnapshot.cs

@ -19,7 +19,7 @@ namespace EShopSample.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("ProductVersion", "6.0.3")
.HasAnnotation("ProductVersion", "6.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
@ -157,6 +157,9 @@ namespace EShopSample.Migrations
b.Property<decimal>("Fee")
.HasColumnType("decimal(20,8)");
b.Property<decimal>("RefundAmount")
.HasColumnType("decimal(20,8)");
b.HasKey("OrderId", "Name", "Key");
b.ToTable("EasyAbpEShopOrdersOrderExtraFees", (string)null);
@ -590,6 +593,31 @@ namespace EShopSample.Migrations
b.ToTable("EasyAbpEShopPaymentsRefundItems", (string)null);
});
modelBuilder.Entity("EasyAbp.EShop.Payments.Refunds.RefundItemOrderExtraFee", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<string>("Key")
.HasColumnType("nvarchar(max)");
b.Property<string>("Name")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("RefundAmount")
.HasColumnType("decimal(20,8)");
b.Property<Guid?>("RefundItemId")
.HasColumnType("uniqueidentifier");
b.HasKey("Id");
b.HasIndex("RefundItemId");
b.ToTable("EasyAbpEShopPaymentsRefundItemOrderExtraFees", (string)null);
});
modelBuilder.Entity("EasyAbp.EShop.Payments.Refunds.RefundItemOrderLine", b =>
{
b.Property<Guid>("Id")
@ -4652,6 +4680,13 @@ namespace EShopSample.Migrations
.HasForeignKey("RefundId");
});
modelBuilder.Entity("EasyAbp.EShop.Payments.Refunds.RefundItemOrderExtraFee", b =>
{
b.HasOne("EasyAbp.EShop.Payments.Refunds.RefundItem", null)
.WithMany("RefundItemOrderExtraFees")
.HasForeignKey("RefundItemId");
});
modelBuilder.Entity("EasyAbp.EShop.Payments.Refunds.RefundItemOrderLine", b =>
{
b.HasOne("EasyAbp.EShop.Payments.Refunds.RefundItem", null)
@ -5006,6 +5041,8 @@ namespace EShopSample.Migrations
modelBuilder.Entity("EasyAbp.EShop.Payments.Refunds.RefundItem", b =>
{
b.Navigation("RefundItemOrderExtraFees");
b.Navigation("RefundItemOrderLines");
});

Loading…
Cancel
Save