diff --git a/Services/Hncore.Pass.BaseInfo/Service/ManageService.cs b/Services/Hncore.Pass.BaseInfo/Service/ManageService.cs index b8843d4..fe825ad 100644 --- a/Services/Hncore.Pass.BaseInfo/Service/ManageService.cs +++ b/Services/Hncore.Pass.BaseInfo/Service/ManageService.cs @@ -190,6 +190,7 @@ namespace Hncore.Pass.BaseInfo.Service {"LoginName", manage.LoginCode}, {"RoleName", ""}, {"OperaterID", manage.Id}, + {"RealName", manage.RealName}, {"TenantId", manage.TenantId} }; diff --git a/Services/Hncore.Pass.BaseInfo/Service/UserService.cs b/Services/Hncore.Pass.BaseInfo/Service/UserService.cs index 5e567c2..f560e3d 100644 --- a/Services/Hncore.Pass.BaseInfo/Service/UserService.cs +++ b/Services/Hncore.Pass.BaseInfo/Service/UserService.cs @@ -211,7 +211,7 @@ namespace Hncore.Pass.BaseInfo.Service entity = await this.Add(entity); - await RandomAssignManager(entity.Id); + // await RandomAssignManager(entity.Id); return new ApiResult(entity); } diff --git a/Services/Hncore.Pass.Manage/Controllers/ManagerController.cs b/Services/Hncore.Pass.Manage/Controllers/ManagerController.cs index 9ad81b6..cff952f 100644 --- a/Services/Hncore.Pass.Manage/Controllers/ManagerController.cs +++ b/Services/Hncore.Pass.Manage/Controllers/ManagerController.cs @@ -131,7 +131,6 @@ namespace Hncore.Pass.Manage.Controllers public async Task GetOne([FromQuery] QueryByIdRequest param) { - param.TenantId = this.Request.GetManageUserInfo().TenantId; return Success(await QueryItemManagerResponse.Query( m_DbContext.Set().GetQueryable() , m_DbContext.Set().GetQueryable() @@ -196,7 +195,7 @@ namespace Hncore.Pass.Manage.Controllers ///管理员权限表操作 - var search = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId && p.TenantId == param.TenantId); + var search = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId); foreach (var item in search) { ManagerToPermission mp = new ManagerToPermission(); @@ -212,15 +211,15 @@ namespace Hncore.Pass.Manage.Controllers mp.CreatorId = param.OperaterId; m_DbContext.Set().Add(mp); } - var del = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id && p.TenantId == param.TenantId).ToList(); + var del = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id).ToList(); m_DbContext.Set().RemoveRange(del); //被转移人项目 - var recipientProject = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id && p.TenantId == param.TenantId); + var recipientProject = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.Data.Id); //我的项目 - var myProject = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId && p.TenantId == param.TenantId); + var myProject = m_DbContext.Set().GetQueryable().Where(p => p.DeleteTag == 0 && p.ManagerId == param.OperaterId); foreach (var item in recipientProject) { item.DeleteTag = 1; @@ -276,7 +275,7 @@ namespace Hncore.Pass.Manage.Controllers [HttpGet] public async Task GetAdminPhoneByManageId([FromQuery] QueryByIdRequest param) { - var result = m_DbContext.Set().GetQueryable().Where(p => p.TenantId == param.TenantId && p.IsRoot == true).ToList(); + var result = m_DbContext.Set().GetQueryable().Where(p => p.IsRoot == true).ToList(); if (result != null && result.Count() > 0) return Success(result[0].Phone); return Success(""); diff --git a/Services/Hncore.Pass.Manage/Response/Manager/QueryItemManagerResponse.cs b/Services/Hncore.Pass.Manage/Response/Manager/QueryItemManagerResponse.cs index c2a3449..2277875 100644 --- a/Services/Hncore.Pass.Manage/Response/Manager/QueryItemManagerResponse.cs +++ b/Services/Hncore.Pass.Manage/Response/Manager/QueryItemManagerResponse.cs @@ -82,7 +82,7 @@ namespace Hncore.Pass.Manage.Response , QueryByIdRequest param ) { - var search = from dw in ManagerQueryable.Where(p => p.DeleteTag == 0 && p.Id == param.Id && p.TenantId == param.TenantId) + var search = from dw in ManagerQueryable.Where(p => p.DeleteTag == 0 && p.Id == param.Id) join mtp in ManagerToPermissionQueryable.Where(p => p.DeleteTag == 0) on dw.Id equals mtp.ManagerId into Permissions select new { dw, Permissions }; diff --git a/Services/Hncore.Pass.Manage/Service/ManagerService.cs b/Services/Hncore.Pass.Manage/Service/ManagerService.cs index 2705e42..d95b086 100644 --- a/Services/Hncore.Pass.Manage/Service/ManagerService.cs +++ b/Services/Hncore.Pass.Manage/Service/ManagerService.cs @@ -55,7 +55,7 @@ namespace Hncore.Pass.Manage.Service }else { - managers = m_DbContext.Set().GetQueryable().Where(m => m.TenantId == request.TenantId && m.DeleteTag == 0); + managers = m_DbContext.Set().GetQueryable().Where(m => m.DeleteTag == 0); //是否过滤超级管理员 if (request.IsRoot == 1) managers = managers.Where(m => m.IsRoot == false); diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index 655dfe2..32dd512 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -320,11 +320,11 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, price = 1.00M; } - if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ - // price = 0.1M; - userEntity.ProductAccountCount = 1; - await m_UserService.Update(userEntity); - } + // if (packageEntity.ProductId != 23 &&packageEntity.ProductId != 22 && ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 2) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ + // // price = 0.1M; + // userEntity.ProductAccountCount = 1; + // await m_UserService.Update(userEntity); + // } var order = new ProductOrderEntity() { AccountCount = 1, @@ -622,6 +622,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, accounts = accounts.Distinct().ToList(); var userEntity = await m_UserService.GetById(order.UserId); + var user_remark = ""; if(order.ProductId == 8||order.ProductId == 7) { @@ -637,6 +638,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, var end_time = DateTime.Now.AddDays(order.DayCount); if (order.PackageName == "测试卡" || order.PackageName == "测试卡(高级)" || order.PackageName == "测试卡(普通)") { end_time = DateTime.Now.AddHours(order.DayCount); + userEntity.ProductAccountCount = 1; } @@ -838,6 +840,8 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, } + userEntity.pay_time = DateTime.Now.ToString(); + await m_UserService.Update(userEntity); } ///