From 6023f73a031bf93797d1cb74e705371abd3990e6 Mon Sep 17 00:00:00 2001 From: 移动系统liao <liaoxujun@qq.com> Date: 星期五, 27 六月 2025 14:47:22 +0800 Subject: [PATCH] no message --- Admin.NET/FZCZTB.NET.SYSService/CustomerSYS/CustomerManagerS.cs | 196 ++++++++++-------------------------------------- 1 files changed, 43 insertions(+), 153 deletions(-) diff --git a/Admin.NET/FZCZTB.NET.SYSService/CustomerSYS/CustomerManagerS.cs b/Admin.NET/FZCZTB.NET.SYSService/CustomerSYS/CustomerManagerS.cs index e0c6411..ab8c7ca 100644 --- a/Admin.NET/FZCZTB.NET.SYSService/CustomerSYS/CustomerManagerS.cs +++ b/Admin.NET/FZCZTB.NET.SYSService/CustomerSYS/CustomerManagerS.cs @@ -1,8 +1,10 @@ 锘縰sing Admin.NET.Core; using Admin.NET.Core.Service; using Furion.DependencyInjection; +using Furion.FriendlyException; using FZCZTB.NET.MD.CutomerMd; using Mapster; +using SqlSugar; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -44,12 +46,13 @@ /// 杩斿洖褰撳墠鍙敤鐨勭敤鎴疯鑹� 鍐嶆敞鍐屽拰鐧诲綍鏃堕渶瑕佽繑鍥炵紪鐮� /// </summary> /// <returns></returns> - public async Task<CustomerDto> GetCustomer(int id) + public async Task<CustomerRDto> GetCustomer(long id) { - - - return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerDto>(); + + return await _fBS_CustomerRep.AsQueryable().Where(x=>x.Id==id&&x.Status== StatusEnum.Enable).Includes(x=>x.CoutomerExRols,y=>y.ExRole) + .Select<CustomerRDto>().WithCache(20).FirstAsync(); + //return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerRDto>(); @@ -62,12 +65,12 @@ /// 杩斿洖褰撳墠鍙敤鐨勭敤鎴疯鑹� 鍐嶆敞鍐屽拰鐧诲綍鏃堕渶瑕佽繑鍥炵紪鐮� /// </summary> /// <returns></returns> - public async Task<CustomerDto> UpDataCustomer(int id) + public async Task<CustomerRDto> UpDataCustomer(int id) { - return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerDto>(); + return (await _fBS_CustomerRep.GetFirstAsync(x => x.Id == id && x.Status == StatusEnum.Enable)).Adapt<CustomerRDto>(); @@ -76,6 +79,7 @@ } + } @@ -131,209 +135,95 @@ /// <summary> /// 瀹㈡埛琛ㄨ緭鍑哄弬鏁� /// </summary> - public class CustomerDto + public class CustomerRDto { - /// <summary> - /// 涓婚敭Id - /// </summary> - public long Id { get; set; } - /// <summary> /// 璐﹀彿 /// </summary> - public string Account { get; set; } + + public virtual string Account { get; set; } /// <summary> /// 瀵嗙爜 /// </summary> - public string Password { get; set; } + + [MaxLength(512)] + + public virtual string Password { get; set; } /// <summary> /// 鐪熷疄濮撳悕 /// </summary> - public string RealName { get; set; } + + [MaxLength(32)] + public virtual string RealName { get; set; } /// <summary> /// 鏄电О /// </summary> + + [MaxLength(32)] public string? NickName { get; set; } /// <summary> /// 澶村儚 /// </summary> + + [MaxLength(512)] public string? Avatar { get; set; } - /// <summary> - /// 鎬у埆 - /// </summary> - public GenderEnum Sex { get; set; } - - /// <summary> - /// 骞撮緞 - /// </summary> - public int Age { get; set; } - - /// <summary> - /// 鍑虹敓鏃ユ湡 - /// </summary> - public DateTime? Birthday { get; set; } - - /// <summary> - /// 姘戞棌 - /// </summary> - public string? Nation { get; set; } + /// <summary> /// 鎵嬫満鍙风爜 /// </summary> + + [MaxLength(16)] public string? Phone { get; set; } - /// <summary> - /// 璇佷欢绫诲瀷 - /// </summary> - public CardTypeEnum CardType { get; set; } - - /// <summary> - /// 韬唤璇佸彿 - /// </summary> - public string? IdCardNum { get; set; } - - /// <summary> - /// 韬唤璇� - /// </summary> - public string? IdCardPath { get; set; } + /// <summary> /// 閭 /// </summary> + + [MaxLength(64)] public string? Email { get; set; } - /// <summary> - /// 鍦板潃 - /// </summary> - public string? Address { get; set; } - /// <summary> - /// 鏂囧寲绋嬪害 - /// </summary> - public CultureLevelEnum CultureLevel { get; set; } - - /// <summary> - /// 鏀挎不闈㈣矊 - /// </summary> - public string? PoliticalOutlook { get; set; } - - /// <summary> - /// 姣曚笟闄㈡牎 - /// </summary> - public string? College { get; set; } - - /// <summary> - /// 鍔炲叕鐢佃瘽 - /// </summary> - public string? OfficePhone { get; set; } - - /// <summary> - /// 绱ф�ヨ仈绯讳汉 - /// </summary> - public string? EmergencyContact { get; set; } - - /// <summary> - /// 绱ф�ヨ仈绯讳汉鐢佃瘽 - /// </summary> - public string? EmergencyPhone { get; set; } - - /// <summary> - /// 绱ф�ヨ仈绯讳汉鍦板潃 - /// </summary> - public string? EmergencyAddress { get; set; } - - /// <summary> - /// 涓汉绠�浠� - /// </summary> - public string? Introduction { get; set; } - - /// <summary> - /// 鎺掑簭 - /// </summary> - public int OrderNo { get; set; } - - /// <summary> - /// 鐘舵�� - /// </summary> - public StatusEnum Status { get; set; } + /// <summary> /// 澶囨敞 /// </summary> + + [MaxLength(256)] public string? Remark { get; set; } - /// <summary> - /// 鑱岀骇 - /// </summary> - public string? PosLevel { get; set; } + - /// <summary> - /// 鑱岀О - /// </summary> - public string? PosTitle { get; set; } - - /// <summary> - /// 鎿呴暱棰嗗煙 - /// </summary> - public string? Expertise { get; set; } - - /// <summary> - /// 鍔炲叕鍖哄煙 - /// </summary> - public string? OfficeZone { get; set; } - - /// <summary> - /// 鍔炲叕瀹� - /// </summary> - public string? Office { get; set; } - - /// <summary> - /// 鍏ヨ亴鏃ユ湡 - /// </summary> - public DateTime? JoinDate { get; set; } - - /// <summary> - /// 鏈�鏂扮櫥褰旾p - /// </summary> - public string? LastLoginIp { get; set; } - - /// <summary> - /// 鏈�鏂扮櫥褰曞湴鐐� - /// </summary> - public string? LastLoginAddress { get; set; } - - /// <summary> - /// 鏈�鏂扮櫥褰曟椂闂� - /// </summary> - public DateTime? LastLoginTime { get; set; } - - /// <summary> - /// 鏈�鏂扮櫥褰曡澶� - /// </summary> - public string? LastLoginDevice { get; set; } /// <summary> /// 鐢靛瓙绛惧悕 /// </summary> + public string? Signature { get; set; } /// <summary> - /// 绉熸埛Id + /// 鐧诲綍瑙掕壊 /// </summary> - public long? TenantId { get; set; } + [Navigate(NavigateType.OneToMany, nameof(FBS_CoutomerExRole.CustomerId))] + public List<FBS_CoutomerExRole> CoutomerExRols { set; get; } /// <summary> - /// 娉ㄥ唽鐢ㄦ埛瑙掕壊 + /// 娉ㄥ唽鐢ㄦ埛瑙掕壊 /// </summary> public string? ExRoleCode { get; set; } - + /// <summary> + /// 鐢ㄦ埛娉ㄥ唽鎵嬫満楠岃瘉鐮� + /// </summary> + public string? PhoneVCode { get; set; } } } -- Gitblit v1.9.1