From 161b84983da40f6254000fe3b2438b9937c2b0d1 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Mon, 10 Jun 2024 19:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MedicalPackages/CreateMedicalPackageDto.cs | 5 ++++- .../MedicalPackages/MedicalPackageDto.cs | 4 ++++ .../MedicalPackages/UpdateMedicalPackageDto.cs | 5 +++++ .../MedicalPackages/MedicalPackageAppService.cs | 1 + .../TransToWebPeis/TransToWebPeisAppService.cs | 7 ++++--- .../MedicalPackages/MedicalPackageManager.cs | 5 ++++- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/MedicalPackages/CreateMedicalPackageDto.cs b/src/Shentun.Peis.Application.Contracts/MedicalPackages/CreateMedicalPackageDto.cs index c2a8552f..df703a92 100644 --- a/src/Shentun.Peis.Application.Contracts/MedicalPackages/CreateMedicalPackageDto.cs +++ b/src/Shentun.Peis.Application.Contracts/MedicalPackages/CreateMedicalPackageDto.cs @@ -48,6 +48,9 @@ namespace Shentun.Peis.MedicalPackages public char IsWebAppoint { get; set; } - + /// + /// 是否基础推荐套餐 + /// + public char IsBasicRecommend { get; set; } } } diff --git a/src/Shentun.Peis.Application.Contracts/MedicalPackages/MedicalPackageDto.cs b/src/Shentun.Peis.Application.Contracts/MedicalPackages/MedicalPackageDto.cs index c2e5875c..ace13d47 100644 --- a/src/Shentun.Peis.Application.Contracts/MedicalPackages/MedicalPackageDto.cs +++ b/src/Shentun.Peis.Application.Contracts/MedicalPackages/MedicalPackageDto.cs @@ -56,6 +56,10 @@ namespace Shentun.Peis.MedicalPackages /// public char IsWebAppoint { get; set; } + /// + /// 是否基础推荐套餐 + /// + public char IsBasicRecommend { get; set; } } } diff --git a/src/Shentun.Peis.Application.Contracts/MedicalPackages/UpdateMedicalPackageDto.cs b/src/Shentun.Peis.Application.Contracts/MedicalPackages/UpdateMedicalPackageDto.cs index daaf1a6b..a97da88b 100644 --- a/src/Shentun.Peis.Application.Contracts/MedicalPackages/UpdateMedicalPackageDto.cs +++ b/src/Shentun.Peis.Application.Contracts/MedicalPackages/UpdateMedicalPackageDto.cs @@ -44,5 +44,10 @@ namespace Shentun.Peis.MedicalPackages /// public char IsWebAppoint { get; set; } + /// + /// 是否基础推荐套餐 + /// + public char IsBasicRecommend { get; set; } + } } diff --git a/src/Shentun.Peis.Application/MedicalPackages/MedicalPackageAppService.cs b/src/Shentun.Peis.Application/MedicalPackages/MedicalPackageAppService.cs index a4e9903e..2598e1ff 100644 --- a/src/Shentun.Peis.Application/MedicalPackages/MedicalPackageAppService.cs +++ b/src/Shentun.Peis.Application/MedicalPackages/MedicalPackageAppService.cs @@ -105,6 +105,7 @@ namespace Shentun.Peis.MedicalPackages Price = s.Price, IsActive = s.IsActive, IsWebAppoint = s.IsWebAppoint, + IsBasicRecommend = s.IsBasicRecommend, CreatorName = EntityHelper.GetSurnameNoSql(userList, s.CreatorId), LastModifierName = EntityHelper.GetSurnameNoSql(userList, s.LastModifierId) }).OrderBy(o => o.DisplayOrder).ToList(); diff --git a/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs b/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs index 4301a1e3..8df7fd86 100644 --- a/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs +++ b/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs @@ -502,9 +502,9 @@ namespace Shentun.Peis.TransToWebPeis foreach (var medicalPackage in medicalPackageWithDetails) { await WebDb.Ado.ExecuteCommandAsync("INSERT INTO public.medical_package(medical_package_id, medical_package_name, price, for_sex_id, is_active, remark, display_order, simple_code," + - "concurrency_stamp,creation_time, creator_id, last_modification_time, last_modifier_id, is_web_appoint, marital_status_id) values " + + "concurrency_stamp,creation_time, creator_id, last_modification_time, last_modifier_id, is_web_appoint, marital_status_id,is_basic_recommend) values " + "(@medical_package_id,@medical_package_name,@price,@for_sex_id,@is_active,@remark,@display_order,@simple_code, " + - "@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint,@marital_status_id)", + "@concurrency_stamp,@creation_time,@creator_id,@last_modification_time,@last_modifier_id,@is_web_appoint,@marital_status_id,@is_basic_recommend)", new List() { new SugarParameter("medical_package_id",medicalPackage.Id), new SugarParameter("medical_package_name",medicalPackage.DisplayName), @@ -520,7 +520,8 @@ namespace Shentun.Peis.TransToWebPeis new SugarParameter("last_modification_time",medicalPackage.LastModificationTime), new SugarParameter("last_modifier_id",medicalPackage.LastModifierId), new SugarParameter("is_web_appoint",medicalPackage.IsWebAppoint), - new SugarParameter("marital_status_id",medicalPackage.MaritalStatusId) + new SugarParameter("marital_status_id",medicalPackage.MaritalStatusId), + new SugarParameter("is_basic_recommend",medicalPackage.IsBasicRecommend) }); //插入明细 diff --git a/src/Shentun.Peis.Domain/MedicalPackages/MedicalPackageManager.cs b/src/Shentun.Peis.Domain/MedicalPackages/MedicalPackageManager.cs index 4739467b..b8acb155 100644 --- a/src/Shentun.Peis.Domain/MedicalPackages/MedicalPackageManager.cs +++ b/src/Shentun.Peis.Domain/MedicalPackages/MedicalPackageManager.cs @@ -55,12 +55,13 @@ namespace Shentun.Peis.MedicalPackages DisplayName = entity.DisplayName, SimpleCode = LanguageConverter.GetPYSimpleCode(entity.DisplayName), ForSexId = entity.ForSexId, - MaritalStatusId = entity.MaritalStatusId, + MaritalStatusId = entity.MaritalStatusId, IsActive = entity.IsActive, Price = entity.Price, Remark = entity.Remark, IsWebAppoint = entity.IsWebAppoint, DisplayOrder = await EntityHelper.CreateMaxDisplayOrder(_repository), + IsBasicRecommend = entity.IsBasicRecommend }; } /// @@ -90,6 +91,7 @@ namespace Shentun.Peis.MedicalPackages targetEntity.Price = sourceEntity.Price; targetEntity.Remark = sourceEntity.Remark; targetEntity.IsWebAppoint = sourceEntity.IsWebAppoint; + targetEntity.IsBasicRecommend = sourceEntity.IsBasicRecommend; } @@ -125,6 +127,7 @@ namespace Shentun.Peis.MedicalPackages DataHelper.CheckCharIsYOrN(entity.IsActive, "是否启用"); DataHelper.CheckCharIsYOrN(entity.IsWebAppoint, "是否支持网上预约"); + DataHelper.CheckCharIsYOrN(entity.IsBasicRecommend, "是否基础推荐套餐"); }