From 38e3665144cbabd5d59f876268053e749f046e3a Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 09 九月 2025 09:33:21 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob --- FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs | 136 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 131 insertions(+), 5 deletions(-) diff --git a/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs b/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs index 688289f..c06c983 100644 --- a/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs +++ b/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs @@ -22,6 +22,53 @@ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + modelBuilder.Entity("FlexJobApi.Core.CodeUrl", b => + { + b.Property<Guid>("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property<string>("Code") + .HasColumnType("nvarchar(max)"); + + b.Property<Guid?>("CreatedEnterpriseId") + .HasColumnType("uniqueidentifier"); + + b.Property<DateTimeOffset>("CreatedTime") + .HasColumnType("datetimeoffset"); + + b.Property<Guid?>("CreatedUserId") + .HasColumnType("uniqueidentifier"); + + b.Property<DateTime?>("ExpiredTime") + .HasColumnType("datetime2"); + + b.Property<bool>("IsDeleted") + .HasColumnType("bit"); + + b.Property<int>("Scene") + .HasColumnType("int"); + + b.Property<int>("Sort") + .HasColumnType("int"); + + b.Property<string>("TraceId") + .HasColumnType("nvarchar(max)"); + + b.Property<DateTimeOffset?>("UpdatedTime") + .HasColumnType("datetimeoffset"); + + b.Property<Guid?>("UpdatedUserId") + .HasColumnType("uniqueidentifier"); + + b.Property<string>("Url") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("CodeUrl", (string)null); + }); + modelBuilder.Entity("FlexJobApi.Core.ContractTemplate", b => { b.Property<Guid>("Id") @@ -961,6 +1008,9 @@ b.Property<int>("Access") .HasColumnType("int"); + b.Property<string>("Account") + .HasColumnType("nvarchar(max)"); + b.Property<string>("AccountBookId") .HasColumnType("nvarchar(max)"); @@ -1017,6 +1067,9 @@ b.Property<bool>("IsDeleted") .HasColumnType("bit"); + + b.Property<string>("MerchantId") + .HasColumnType("nvarchar(max)"); b.Property<string>("PersonalProductCode") .HasColumnType("nvarchar(max)"); @@ -1279,6 +1332,12 @@ b.Property<string>("ProductCode") .HasColumnType("nvarchar(max)"); + b.Property<string>("ReceiveAccount") + .HasColumnType("nvarchar(max)"); + + b.Property<string>("ReceiveName") + .HasColumnType("nvarchar(max)"); + b.Property<string>("ReceiverOpenId") .HasColumnType("nvarchar(max)"); @@ -1299,6 +1358,9 @@ b.Property<string>("SubStatus") .HasColumnType("nvarchar(max)"); + + b.Property<Guid?>("TaskUserId") + .HasColumnType("uniqueidentifier"); b.Property<string>("TraceId") .HasColumnType("nvarchar(max)"); @@ -1322,6 +1384,8 @@ .HasColumnType("uniqueidentifier"); b.HasKey("Id"); + + b.HasIndex("TaskUserId"); b.HasIndex("WalletId"); @@ -1833,6 +1897,9 @@ .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); + b.Property<decimal?>("ActualSettlementAmount") + .HasColumnType("decimal(18,2)"); + b.Property<string>("AddressDetail") .HasColumnType("nvarchar(max)"); @@ -1915,14 +1982,38 @@ b.Property<decimal>("ServiceFee") .HasColumnType("decimal(18,2)"); + b.Property<decimal?>("SettlementAmount") + .HasColumnType("decimal(18,2)"); + b.Property<int>("SettlementCycle") .HasColumnType("int"); + + b.Property<string>("SettlementOrderName") + .HasColumnType("nvarchar(max)"); + + b.Property<int?>("SettlementOrderStatus") + .HasColumnType("int"); + + b.Property<DateTime?>("SettlementOrderTime") + .HasColumnType("datetime2"); + + b.Property<string>("SettlementOrderUrl") + .HasColumnType("nvarchar(max)"); + + b.Property<string>("SettlementRemark") + .HasColumnType("nvarchar(max)"); + + b.Property<DateTime?>("SettlementStartTime") + .HasColumnType("datetime2"); b.Property<int?>("SettlementStatus") .HasColumnType("int"); b.Property<DateTime?>("SettlementTime") .HasColumnType("datetime2"); + + b.Property<int>("SettlementUserCount") + .HasColumnType("int"); b.Property<int>("Sort") .HasColumnType("int"); @@ -2048,11 +2139,20 @@ .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); + b.Property<decimal?>("ActualSettlementAmount") + .HasColumnType("decimal(18,2)"); + b.Property<int?>("ArrangeStatus") .HasColumnType("int"); b.Property<DateTime?>("ArrangeTime") .HasColumnType("datetime2"); + + b.Property<string>("Bank") + .HasColumnType("nvarchar(max)"); + + b.Property<string>("BankBranch") + .HasColumnType("nvarchar(max)"); b.Property<int?>("CheckReceiveStatus") .HasColumnType("int"); @@ -2085,6 +2185,24 @@ .HasColumnType("datetime2"); b.Property<DateTime?>("LastSubmitTime") + .HasColumnType("datetime2"); + + b.Property<string>("ReceiveAccount") + .HasColumnType("nvarchar(max)"); + + b.Property<string>("ReceiveName") + .HasColumnType("nvarchar(max)"); + + b.Property<decimal?>("SettlementAmount") + .HasColumnType("decimal(18,2)"); + + b.Property<string>("SettlementRemark") + .HasColumnType("nvarchar(max)"); + + b.Property<int?>("SettlementStatus") + .HasColumnType("int"); + + b.Property<DateTime?>("SettlementTime") .HasColumnType("datetime2"); b.Property<int>("Sort") @@ -2503,13 +2621,16 @@ .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); + b.Property<int>("Access") + .HasColumnType("int"); + b.Property<string>("Bank") - .IsRequired() - .HasMaxLength(128) - .HasColumnType("nvarchar(128)"); + .HasColumnType("nvarchar(max)"); + + b.Property<string>("BankBranch") + .HasColumnType("nvarchar(max)"); b.Property<string>("Code") - .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)"); @@ -2526,7 +2647,6 @@ .HasColumnType("bit"); b.Property<string>("PhoneNumber") - .IsRequired() .HasMaxLength(11) .HasColumnType("nvarchar(11)"); @@ -3058,12 +3178,18 @@ modelBuilder.Entity("FlexJobApi.Core.EnterpriseWalletTransaction", b => { + b.HasOne("FlexJobApi.Core.TaskInfoUser", "TaskUser") + .WithMany() + .HasForeignKey("TaskUserId"); + b.HasOne("FlexJobApi.Core.EnterpriseWallet", "Wallet") .WithMany() .HasForeignKey("WalletId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); + b.Navigation("TaskUser"); + b.Navigation("Wallet"); }); -- Gitblit v1.9.1