YD/YD_Event.Admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

字段统一命名

Browse Source
This commit is contained in:
马梓彭 2026-03-25 09:09:45 +08:00
parent 92043a4519
commit 976a1e7e43
12 changed files with 35 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
YD_Event.Application/AppUser/AppUserService.cs
View File

@ -105,7 +105,7 @@ public class AppUserService : BaseService<AppUserEntity>, ITransient
.Where(x => x.PersonType == input.PersonType && !x.DeleteMark)
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), x => x.Name.Contains(input.Name))
.WhereIF(input.Gender.HasValue, x => x.Gender == input.Gender)
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), x => x.Mobile.Contains(input.Phone))
.WhereIF(!string.IsNullOrWhiteSpace(input.Mobile), x => x.Mobile.Contains(input.Mobile))
.WhereIF(!string.IsNullOrWhiteSpace(input.IdCardNumber), u => u.IdCardNumber.Contains(input.IdCardNumber))
.WhereIF(input.PersonType == PersonType.Coach && !string.IsNullOrWhiteSpace(input.SkillLevel), x => x.SkillLevel == input.SkillLevel)
.WhereIF(input.PersonType == PersonType.Coach && input.CertificationStatus.HasValue, x => x.CertificationStatus == input.CertificationStatus)
@ -142,10 +142,10 @@ public class AppUserService : BaseService<AppUserEntity>, ITransient
// 校验唯一性 (手机号或身份证号，具体根据角色定)
// 运动员主要查身份证，领队教练查手机号。这里综合校验。
var queryPhone = _appUserRep.AsQueryable()
.Where(x => x.Mobile == input.Phone && x.PersonType == input.PersonType && !x.DeleteMark);
.Where(x => x.Mobile == input.Mobile && x.PersonType == input.PersonType && !x.DeleteMark);
var queryIdCard = _appUserRep.AsQueryable()
.Where(x => x.IdCardNumber == input.IdCard && x.PersonType == input.PersonType && !x.DeleteMark);
.Where(x => x.IdCardNumber == input.IdCardNumber && x.PersonType == input.PersonType && !x.DeleteMark);
if (input.Id.HasValue)
{
@ -201,11 +201,11 @@ public class AppUserService : BaseService<AppUserEntity>, ITransient
entity.Name = input.Name;
entity.Gender = input.Gender;
entity.IdCardNumber = input.IdCard;
entity.IdCardNumber = input.IdCardNumber;
entity.IdCardImageUrl = input.IdCardUrl;
entity.Mobile = input.Phone;
entity.Mobile = input.Mobile;
entity.Remark = input.Remark;
entity.AuditRemark = "";
entity.AuditRemark = "";
// 计算年龄逻辑
if (input.BirthDate.HasValue)

6
YD_Event.Application/AppUser/Dtos/AppUserDtos.cs
View File

@ -64,7 +64,7 @@ public class MemberQueryInput : Pagination
/// <summary>
/// 联系电话
/// </summary>
public string? Phone { get; set; }
public string? Mobile { get; set; }
/// <summary>
/// 身份证号 (运动员常用)
@ -157,7 +157,7 @@ public class CreateOrUpdateMemberInput
/// </summary>
//[Required(ErrorMessage = "身份证号不能为空")]
//[RegularExpression(@"(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)", ErrorMessage = "身份证号格式不正确")]
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 身份证图片URL
@ -174,7 +174,7 @@ public class CreateOrUpdateMemberInput
/// </summary>
[Required(ErrorMessage = "联系电话不能为空")]
[RegularExpression(@"^1[3456789]\d{9}$", ErrorMessage = "手机号格式不正确")]
public string Phone { get; set; }
public string Mobile { get; set; }
/// <summary>
/// 技能等级（教练特有）

2
YD_Event.Application/Certificate/Dtos/CertificateTemplateDtos.cs
View File

@ -302,7 +302,7 @@ public class CertificateTemplateOutput
/// <summary>
/// 状态
/// </summary>
public string Status { get; set; }
public AvailabilityStatus Status { get; set; }
/// <summary>
/// 创建时间

57
YD_Event.Application/Certificate/Dtos/CreateCertificateInput.cs
View File

@ -1,57 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace YD_Event.Application.Certificate.Dtos
{
/// <summary>
/// 创建证书输入参数
/// </summary>
public class CreateCertificateInput
{
/// <summary>
/// 证书名称
/// </summary>
[Required(ErrorMessage = "证书名称不能为空")]
[StringLength(100, ErrorMessage = "证书名称长度不能超过100个字符")]
public string Name { get; set; }
/// <summary>
/// 证书标题
/// </summary>
[Required(ErrorMessage = "证书标题不能为空")]
[StringLength(200, ErrorMessage = "证书标题长度不能超过200个字符")]
public string Title { get; set; }
/// <summary>
/// 发放规则
/// </summary>
[StringLength(500, ErrorMessage = "发放规则长度不能超过500个字符")]
public string IssueRule { get; set; }
/// <summary>
/// 证书模板内容
/// </summary>
public string TemplateContent { get; set; }
/// <summary>
/// 二维码地址
/// </summary>
[StringLength(200, ErrorMessage = "二维码地址长度不能超过200个字符")]
public string QrCodeUrl { get; set; }
/// <summary>
/// 证书状态
/// </summary>
[Required(ErrorMessage = "证书状态不能为空")]
public AvailabilityStatus Status { get; set; }
/// <summary>
/// 排序
/// </summary>
public int Sort { get; set; }
}
}

12
YD_Event.Application/Client/Dtos/EventClientDtos.cs
View File

@ -321,7 +321,7 @@ public class PersonInput
/// 身份证号
/// </summary>
[Required]
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 性别
@ -331,7 +331,7 @@ public class PersonInput
/// <summary>
/// 电话
/// </summary>
public string Phone { get; set; }
public string Mobile { get; set; }
/// <summary>
/// 出生日期
@ -413,7 +413,7 @@ public class UpdatePlayerInput
/// 身份证号
/// </summary>
[Required]
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 性别
@ -423,7 +423,7 @@ public class UpdatePlayerInput
/// <summary>
/// 电话
/// </summary>
public string Phone { get; set; }
public string Mobile { get; set; }
}
/// <summary>
@ -587,7 +587,7 @@ public class RegistrationPersonDto
/// <summary>
/// 身份证号
/// </summary>
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 性别
@ -597,7 +597,7 @@ public class RegistrationPersonDto
/// <summary>
/// 电话
/// </summary>
public string Phone { get; set; }
public string Mobile { get; set; }
}
/// <summary>

12
YD_Event.Application/Client/EventClientController.cs
View File

@ -359,9 +359,9 @@ public class EventClientController : IDynamicApiController
PersonType = PersonType.Athlete, // 运动员
Name = pInput.Name,
Gender = pInput.Gender,
IdCard = pInput.IdCard,
IdCard = pInput.IdCardNumber,
BirthDate = pInput.BirthDate,
Phone = pInput.Phone,
Phone = pInput.Mobile,
GroupName = item.GroupName,
ProjectName = project.Name,
CreatedUserId = userId,
@ -437,9 +437,9 @@ public class EventClientController : IDynamicApiController
if (reg == null || reg.CreatedUserId != userId) throw Oops.Bah("无权操作");
person.Name = input.Name;
person.IdCard = input.IdCard;
person.IdCard = input.IdCardNumber;
person.Gender = input.Gender;
person.Phone = input.Phone;
person.Phone = input.Mobile;
person.UpdatedTime = DateTime.Now;
person.UpdatedUserId = userId;
@ -545,9 +545,9 @@ public class EventClientController : IDynamicApiController
{
Id = p.Id,
Name = p.Name,
IdCard = p.IdCard,
IdCardNumber = p.IdCard,
Gender = p.Gender,
Phone = p.Phone
Mobile = p.Phone
}).ToList()
}).ToList()
};

6
YD_Event.Application/Event/Dtos/ScoreDtos.cs
View File

@ -104,7 +104,7 @@ public class CoachLeaderQueryInput : Pagination
/// <summary>
/// 电话
/// </summary>
public string? Phone { get; set; }
public string? Mobile { get; set; }
}
/// <summary>
@ -135,12 +135,12 @@ public class CoachLeaderListOutput
/// <summary>
/// 身份证号
/// </summary>
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 电话
/// </summary>
public string Phone { get; set; }
public string Mobile { get; set; }
/// <summary>
/// 证书ID

2
YD_Event.Application/Event/Dtos/UserCompetitionDtos.cs
View File

@ -326,7 +326,7 @@ public class UserTeamMemberOutput
/// <summary>
/// 身份证号 (脱敏显示)
/// </summary>
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 性别

6
YD_Event.Application/Event/EventScoreService.cs
View File

@ -73,15 +73,15 @@ public class EventScoreService : BaseService<EventResult>, ITransient
.InnerJoin<EventRegistration>((p, c, r) => p.RegistrationId == r.Id)
.Where((p, c, r) => r.EventId == input.EventId && p.PersonType == input.PersonType)
.WhereIF(!string.IsNullOrWhiteSpace(input.Name), p => p.Name.Contains(input.Name))
.WhereIF(!string.IsNullOrWhiteSpace(input.Phone), p => p.Phone.Contains(input.Phone))
.WhereIF(!string.IsNullOrWhiteSpace(input.Mobile), p => p.Phone.Contains(input.Mobile))
.Select((p, c) => new CoachLeaderListOutput
{
Id = p.Id,
Name = p.Name,
Age = p.Age,
Gender = p.Gender.ToString(),
IdCard = p.IdCard,
Phone = p.Phone,
IdCardNumber = p.IdCard,
Mobile = p.Phone,
CertificateId = c.Id
})
.ToPagedListAsync(input);

4
YD_Event.Application/Event/UserEventRegistrationService.cs
View File

@ -223,7 +223,7 @@ public class UserEventRegistrationService : IDynamicApiController, ITransient
UserId = u.Id,
Name = u.Name,
Mobile = u.Mobile,
IdCard = MaskIdCard(u.IdCardNumber),
IdCardNumber = MaskIdCard(u.IdCardNumber),
Gender = u.Gender.ToString(),
IsEligible = true,
IneligibilityReason = ""
@ -366,7 +366,7 @@ public class UserEventRegistrationService : IDynamicApiController, ITransient
{
Name = p.Name,
Mobile = p.Phone,
IdCard = MaskIdCard(p.IdCard),
IdCardNumber = MaskIdCard(p.IdCard),
Gender = p.Gender.ToString()
}).ToList();

4
YD_Event.Application/Order/Dtos/CreateOrderInput.cs
View File

@ -53,12 +53,12 @@ public class CreateOrderPersonInput
/// 证件号码
/// </summary>
[Required]
public string IdCard { get; set; }
public string IdCardNumber { get; set; }
/// <summary>
/// 手机号
/// </summary>
public string? Phone { get; set; }
public string? Mobile { get; set; }
/// <summary>
/// 性别

4
YD_Event.Application/applicationsettings.json
View File

@ -99,8 +99,8 @@
},
// 微信小程序配置
"WeChat": {
"AppId": "wx1234567890abcdef",
"Secret": "1234567890abcdef1234567890abcdef"
"AppId": "wxf5a3f98d44c3a563",
"Secret": "ef6d17e0419700c137e066aa3dce23ca"
},
// 雪花id 文档：https://github.com/yitter/IdGenerator
"SnowId": {