diff --git a/YD_Event.Application/Client/Dtos/EventClientDtos.cs b/YD_Event.Application/Client/Dtos/EventClientDtos.cs index 5b3fba9..82f6ced 100644 --- a/YD_Event.Application/Client/Dtos/EventClientDtos.cs +++ b/YD_Event.Application/Client/Dtos/EventClientDtos.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using YD_Event.Core.Enum; +using YD_Event.Application.Event.Dtos; namespace YD_Event.Application.Client.Dtos; @@ -193,53 +194,6 @@ public class EventFeeConfigDto public Dictionary? ProjectPrices { get; set; } } -/// -/// 积分规则明细DTO -/// -public class PointsRuleDetailDto -{ - /// - /// 起始名次 - /// - public int StartRank { get; set; } - - /// - /// 截止名次 - /// - public int EndRank { get; set; } - - /// - /// 发放积分个数 - /// - public int Points { get; set; } -} - -/// -/// 积分规则DTO -/// -public class PointsRuleDto -{ - /// - /// 积分规则名称 - /// - public string RuleName { get; set; } - - /// - /// 参与积分(发放积分个数) - /// - public int? ParticipationPoints { get; set; } - - /// - /// 备注 - /// - public string? Remark { get; set; } - - /// - /// 名次积分规则明细 - /// - public List? Details { get; set; } -} - /// /// 退款规则DTO /// diff --git a/YD_Event.Application/Client/EventClientController.cs b/YD_Event.Application/Client/EventClientController.cs index 853b4c9..ea54ef3 100644 --- a/YD_Event.Application/Client/EventClientController.cs +++ b/YD_Event.Application/Client/EventClientController.cs @@ -300,17 +300,17 @@ public class EventClientController : IDynamicApiController var refundRuleSnapshots = await _ruleSnapshotService.GetRefundRuleSnapshot(evt.Id); // 使用快照数据转换为详情DTO - YD_Event.Application.Client.Dtos.PointsRuleDto? pointsRuleDetail = null; + YD_Event.Application.Event.Dtos.PointsRuleDto? pointsRuleDetail = null; List? refundRules = null; if (pointsRuleSnapshot != null) { - pointsRuleDetail = new YD_Event.Application.Client.Dtos.PointsRuleDto + pointsRuleDetail = new YD_Event.Application.Event.Dtos.PointsRuleDto { RuleName = pointsRuleSnapshot.RuleName, ParticipationPoints = pointsRuleSnapshot.ParticipationPoints, Remark = pointsRuleSnapshot.Remark, - Details = pointsRuleSnapshot.Details.Select(d => new YD_Event.Application.Client.Dtos.PointsRuleDetailDto + Details = pointsRuleSnapshot.Details.Select(d => new YD_Event.Application.Event.Dtos.PointsRuleDetailDto { StartRank = d.StartRank, EndRank = d.EndRank, diff --git a/YD_Event.Application/Event/Dtos/UserCompetitionDtos.cs b/YD_Event.Application/Event/Dtos/UserCompetitionDtos.cs index a1f20e0..066ec06 100644 --- a/YD_Event.Application/Event/Dtos/UserCompetitionDtos.cs +++ b/YD_Event.Application/Event/Dtos/UserCompetitionDtos.cs @@ -156,7 +156,7 @@ public class UserEventDetailOutput /// /// 积分规则详情 /// - public YD_Event.Application.Client.Dtos.PointsRuleDto? PointsRuleDetail { get; set; } + public YD_Event.Application.Event.Dtos.PointsRuleDto? PointsRuleDetail { get; set; } /// /// 退款规则详情 diff --git a/YD_Event.Application/Event/UserEventRegistrationService.cs b/YD_Event.Application/Event/UserEventRegistrationService.cs index 3233362..8976fcc 100644 --- a/YD_Event.Application/Event/UserEventRegistrationService.cs +++ b/YD_Event.Application/Event/UserEventRegistrationService.cs @@ -254,12 +254,12 @@ public class UserEventRegistrationService : IDynamicApiController, ITransient { output.PointsRuleName = pointsRuleSnapshot.RuleName ?? ""; - output.PointsRuleDetail = new YD_Event.Application.Client.Dtos.PointsRuleDto + output.PointsRuleDetail = new YD_Event.Application.Event.Dtos.PointsRuleDto { RuleName = pointsRuleSnapshot.RuleName, ParticipationPoints = pointsRuleSnapshot.ParticipationPoints, Remark = pointsRuleSnapshot.Remark, - Details = pointsRuleSnapshot.Details.Select(d => new YD_Event.Application.Client.Dtos.PointsRuleDetailDto + Details = pointsRuleSnapshot.Details.Select(d => new YD_Event.Application.Event.Dtos.PointsRuleDetailDto { StartRank = d.StartRank, EndRank = d.EndRank, diff --git a/YD_Event.Application/YD_Event.Application.xml b/YD_Event.Application/YD_Event.Application.xml index d5af9c8..3c96ed7 100644 --- a/YD_Event.Application/YD_Event.Application.xml +++ b/YD_Event.Application/YD_Event.Application.xml @@ -1989,51 +1989,6 @@ 项目价格字典 (key: 项目ID, value: 价格) - - - 积分规则明细DTO - - - - - 起始名次 - - - - - 截止名次 - - - - - 发放积分个数 - - - - - 积分规则DTO - - - - - 积分规则名称 - - - - - 参与积分(发放积分个数) - - - - - 备注 - - - - - 名次积分规则明细 - - 退款规则DTO