diff --git a/modules/admin/src/KonSoft.Admin.Domain/Repositories/IOrderRepository.cs b/modules/admin/src/KonSoft.Admin.Domain/IRepositories/IOrderRepository.cs similarity index 100% rename from modules/admin/src/KonSoft.Admin.Domain/Repositories/IOrderRepository.cs rename to modules/admin/src/KonSoft.Admin.Domain/IRepositories/IOrderRepository.cs diff --git a/modules/admin/src/KonSoft.Admin.Domain/Repositories/IProductRepository.cs b/modules/admin/src/KonSoft.Admin.Domain/IRepositories/IProductRepository.cs similarity index 100% rename from modules/admin/src/KonSoft.Admin.Domain/Repositories/IProductRepository.cs rename to modules/admin/src/KonSoft.Admin.Domain/IRepositories/IProductRepository.cs diff --git a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs index 5eed71b..5f7dcdb 100644 --- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs +++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs @@ -55,9 +55,9 @@ public class AdminDbContext : #endregion #region 订单 - public DbSet Order { get; set; } - public DbSet Worker { get; set; } - public DbSet ServiceCategory { get; set; } + public DbSet Orders { get; set; } + public DbSet Workers { get; set; } + public DbSet ServiceCategorys { get; set; } #endregion public AdminDbContext(DbContextOptions options) diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs new file mode 100644 index 0000000..2947aae --- /dev/null +++ b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Identity; + +namespace KonSoft.TenantManagement.Entities +{ + /// + /// 家政服务工人实体 + /// + public class HouseholdWorker:IdentityUser + { + /// + /// 接单数 + /// + public int OrderCount { get; set; } + /// + /// 职业 + /// + public required string Profession { get; set; } + /// + /// 能力范围 + /// + public required string ScopeOfCompetence { get; set; } + + } +} diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs new file mode 100644 index 0000000..929fc91 --- /dev/null +++ b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using KonSoft.TenantManagement.Entities; +using Volo.Abp.Domain.Repositories; + +namespace KonSoft.TenantManagement.IRepositories +{ + public interface IHouseholdWorkerRepository: EfCoreRepository, IRepository + { + } +} diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj index fe6ddbc..c04d11a 100644 --- a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj +++ b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj @@ -1,4 +1,4 @@ - + net8.0 diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs new file mode 100644 index 0000000..908279d --- /dev/null +++ b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs @@ -0,0 +1,14 @@ +using KonSoft.TenantManagement.Entities; +using KonSoft.TenantManagement.IRepositories; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace KonSoft.TenantManagement.EntityFrameworkCore.Repositories +{ + public class HouseholdWorkerRepository: EfCoreRepository,IHouseholdWorkerRepository + { + public HouseholdWorkerRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + } +} diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs index 42fb62f..b85529d 100644 --- a/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs +++ b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using KonSoft.TenantManagement.Entities; +using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.Data; @@ -52,7 +53,7 @@ public class TenantManagementDbContext : public DbSet TenantConnectionStrings { get; set; } #endregion - + public DbSet HouseholdWorkers { get; set; } public TenantManagementDbContext(DbContextOptions options) : base(options) {