From 376f3de70bfdd7905876123ba5a331c0aa176199 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期四, 25 九月 2025 09:10:29 +0800
Subject: [PATCH] 修改注册时可以多模块注册
---
Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs | 90 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs b/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs
index d641f88..4288a85 100644
--- a/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs
+++ b/Admin.NET/FZCTB.NET.API.Application/User/CustomerService.cs
@@ -90,11 +90,19 @@
{
//_customerManager.
var ExRole= (await _customerManager.GetExRole()).Where(x => x.Code == param.ExRoleCode).FirstOrDefault();
-
- if(ExRole==null)
+ if(string.IsNullOrEmpty(param.ExRoleCode))
{
- throw Oops.Oh("璇烽�夋嫨涓�涓湁鏁堢殑瑙掕壊杩涜娉ㄥ唽");
+ throw Oops.Oh("璇疯嚦灏戦�夋嫨涓�涓敞鍐岃鑹�");
}
+ var EzRoleListstr= param.ExRoleCode.Split(',');
+
+ var EzRoleList= (await _customerManager.GetExRole()).Where(x => EzRoleListstr.Contains(x.Code) && x.Status == StatusEnum.Enable).ToList();
+ if(EzRoleListstr.Count() != EzRoleList?.Count())
+ {
+ throw Oops.Oh("娉ㄥ唽瑙掕壊鏈夎锛岃閫夋嫨鏈夋晥鐨勮鑹茶繘琛屾敞鍐�");
+ }
+
+
// //宸查�夎鑹诧紝璇烽�夋嫨涓�涓敞鍐岃鑹�
//var data= await _fBS_CustomerRep.AsQueryable().Includes(X => X.CoutomerExRols,y=>y.ExRole).Where(x => x.Account == param.Account).FirstAsync();
@@ -143,15 +151,23 @@
{
dd = await _fBS_CusExtendRep.InsertReturnEntityAsync(dd);
- FBS_CoutomerExRole rulse = new FBS_CoutomerExRole
+ foreach (var item in EzRoleList)
{
- CusExtendId = dd.Id,
- ExRoleId = ExRole.Id ?? 0,
- steps = CusExtendStep.UNExamine
- };
- await _fBS_CustomerExRoleRep.InsertAsync(rulse);
+ FBS_CoutomerExRole rulse = new FBS_CoutomerExRole
+ {
+ CusExtendId = dd.Id,
+ ExRoleId = item.Id ?? 0,
+ steps = CusExtendStep.UNExamine,
+ CreateTime = DateTime.Now,
+ CreateUserName = "浼佷笟鐢ㄦ埛:" + ThisUser?.Name,
+ CreateUserId = ThisUser?.Id
+
+
+ };
+ await _fBS_CustomerExRoleRep.InsertAsync(rulse);
+ }
FBS_CustormerUsers user = new FBS_CustormerUsers
{
@@ -249,6 +265,10 @@
ExRoleId = rols.Id,
CusExtendId = user.CusExtendId,
steps= CusExtendStep.UNExamine,
+
+ CreateTime = DateTime.Now,
+ CreateUserName = "浼佷笟鐢ㄦ埛:" + ThisUser?.Name,
+ CreateUserId = ThisUser?.Id,
});
@@ -448,7 +468,7 @@
}
if (!await isManger())
throw Oops.Oh("鐢ㄦ埛娌℃湁鏉冮檺");
- return (await _fBS_CustormerUsersRep.GetListAsync(x => x.CusExtendId == id&&x.IsEn==true)).Adapt<List<FBS_CustormerUsersOutput>>();
+ return (await _fBS_CustormerUsersRep.GetListAsync(x => x.CusExtendId == id)).Adapt<List<FBS_CustormerUsersOutput>>();
}
public FBS_CustormerUsers? ThisUser { get; set; }
/// <summary>
@@ -521,14 +541,14 @@
}
var User = await _fBS_CustormerUsersRep.GetFirstAsync(x =>x.CusExtendId==ThisUser.CusExtendId &&x.Id== CustormerUserId);
- if (User != null)
+ if (User == null)
{
throw Oops.Oh("鐢ㄦ埛涓嶅瓨鍦�");
}
if(User.IsEn==false)
throw Oops.Oh("鏃犳晥鐢ㄦ埛涓嶅彲璁剧疆涓虹鐞嗗憳");
- User.IsManager = true;
+ User.IsManager = !User.IsManager;
User.UpdateTime = DateTime.Now;
User.UpdateUserName= "浼佷笟鐢ㄦ埛:" + ThisUser?.Name;
User.UpdateUserId = ThisUser.Id;
@@ -581,13 +601,13 @@
{
throw Oops.Oh("Id閿欒");
}
- if(Param.CusExtendId!=Param.Id)
+ if(Param.CusExtendId!= cid)
{
throw Oops.Oh("缁勭粐鏈烘瀯涓嶅悓涓嶅彲淇敼");
}
var User = await _fBS_CustormerUsersRep.GetFirstAsync(x => x.CusExtendId == Param.CusExtendId && x.Id == Param.Id);
- if (User != null)
+ if (User == null)
{
throw Oops.Oh("鐢ㄦ埛涓嶅瓨鍦�");
}
@@ -602,6 +622,48 @@
}
+
+ /// <summary>
+ /// 鍒犻櫎鍛樺伐
+ /// </summary>
+ /// <param name="CustormerUserId"> UserList 鐨処D</param>
+ /// <returns></returns>
+ [HttpDelete]
+ public async Task<bool> DelCustormerUsers(long CustormerUserId)
+ {
+ if (!await isManger())
+ throw Oops.Oh("鐢ㄦ埛娌℃湁鏉冮檺");
+ var cid = App.User.FindFirst(ClaimConst.CustomerExId)?.Value.ToLong() ?? 0;
+ if (cid == 0)
+ {
+ throw Oops.Oh("鐢ㄦ埛鍑瘉閿欒");
+
+ }
+ var uid = App.User.FindFirst(ClaimConst.UserId)?.Value.ToLong() ?? 0;
+ if (uid == 0)
+ {
+
+
+ }
+ if (CustormerUserId == uid)
+ throw Oops.Oh("鑷繁涓嶅彲鍒犻櫎鑷繁");
+ if (ThisUser == null)
+ {
+
+ ThisUser = await _fBS_CustormerUsersRep.GetFirstAsync(x => x.Id == uid && x.CusExtendId == cid && x.IsEn == true);
+
+ }
+ var User = await _fBS_CustormerUsersRep.GetFirstAsync(x => x.CusExtendId == ThisUser.CusExtendId && x.Id == CustormerUserId);
+ if (User == null)
+ {
+ throw Oops.Oh("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ return await _fBS_CustormerUsersRep.DeleteByIdAsync(CustormerUserId);
+
+
+
+ }
+
/// <summary>
/// 鏉冮檺楠岃瘉鏄惁鏄鐞嗗憳
/// </summary>
--
Gitblit v1.9.1