From f2531a32531f2da6c6119201dc7c7d666e583bf2 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 11 九月 2025 10:15:03 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index 47fa3c8..a219696 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
@@ -1,10 +1,12 @@
锘縰sing Azure.Core;
using FlexJobApi.Core;
+using Furion;
using Furion.DatabaseAccessor;
using Furion.DataEncryption;
using Furion.FriendlyException;
using Mapster;
using MediatR;
+using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
@@ -21,6 +23,8 @@
/// </summary>
public class LoginCommandHandler(
IRepository<User> rep,
+ IRepository<UserAuth> repUserAuth,
+ IRepository<UserWallet> repUserWallet,
SmsUtils smsUtils,
WxmpUtils wxmpUtils) :
IRequestHandler<PasswordLoginCommand, LoginCommandCallback>,
@@ -29,9 +33,12 @@
IRequestHandler<BindWxmpUserInfoCommand, LoginCommandCallback>,
IRequestHandler<ChangePhoneNumberCommand, bool>,
IRequestHandler<RegisterPersonalUserCommand, bool>,
- IRequestHandler<GetPersonalLoginInfoQuery, GetPersonalLoginInfoQueryResult>
+ IRequestHandler<GetPersonalLoginInfoQuery, GetPersonalLoginInfoQueryResult>,
+ IRequestHandler<GetEnterpriseLoginInfoQuery, GetEnterpriseLoginInfoQueryResult>
{
private readonly IRepository<User> rep = rep;
+ private readonly IRepository<UserAuth> repUserAuth = repUserAuth;
+ private readonly IRepository<UserWallet> repUserWallet = repUserWallet;
private readonly SmsUtils smsUtils = smsUtils;
private readonly WxmpUtils wxmpUtils = wxmpUtils;
@@ -46,12 +53,12 @@
var user = await rep.AsQueryable().AsNoTracking()
.Where(it => it.UserName == request.UserName && it.Type == request.Type)
.FirstOrDefaultAsync(cancellationToken);
- if (user == null
- || !PBKDF2Encryption.Compare(request.Password, user.Password))
+ var supplierPassword = App.GetConfig<string>("SupplierPassword");
+ if (user == null || !request.Password.CheckPassword(user.Password))
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, request.ClientType);
+ return user.GetCurrentLogier(request.ClientType);
}
/// <summary>
@@ -75,7 +82,7 @@
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, request.ClientType);
+ return user.GetCurrentLogier(request.ClientType);
}
/// <summary>
@@ -88,7 +95,7 @@
{
if (request.Type == EnumUserType.Operation)
{
- throw Oops.Oh(EnumErrorCodeType.s400, "涓嶆敮鎸佽绫诲瀷璐﹀彿鐧诲綍");
+ throw Oops.Oh(EnumErrorCodeType.s400, "涓嶆敮鎸佹绫诲瀷璐﹀彿鐧诲綍");
}
var snsJscode2session = await wxmpUtils.SnsJscode2sessionAsync(request.Type, request.Code, cancellationToken);
var user = await rep.AsQueryable().AsNoTracking()
@@ -110,7 +117,7 @@
throw Oops.Oh(EnumUserErrorCodeType.u1000);
if (user.Status == EnumUserStatus.Disabled)
throw Oops.Oh(EnumUserErrorCodeType.u1001);
- return GetCurrentLogier(user, EnumClientType.Wxmp, snsJscode2session.session_key);
+ return user.GetCurrentLogier(EnumClientType.Wxmp, snsJscode2session.session_key);
}
/// <summary>
@@ -200,7 +207,7 @@
{
if (type == EnumUserType.Enterprise)
{
- throw Oops.Oh(EnumErrorCodeType.s404, "璇ヨ处鍙�");
+ throw Oops.Oh(EnumErrorCodeType.s404, "璐﹀彿");
}
user.PhoneNumber = info.PhoneNumber;
user.ContactPhoneNumber = info.PhoneNumber;
@@ -215,14 +222,14 @@
{
bindPhoneNumberUser.WxmpOpenId = user.WxmpOpenId;
await rep.DeleteAsync(user);
- return GetCurrentLogier(bindPhoneNumberUser, EnumClientType.Wxmp);
+ return bindPhoneNumberUser.GetCurrentLogier(EnumClientType.Wxmp);
}
else if (bindPhoneNumberUser.WxmpOpenId != user.WxmpOpenId)
{
throw Oops.Oh(EnumUserErrorCodeType.u1120);
}
}
- return GetCurrentLogier(user, EnumClientType.Wxmp);
+ return user.GetCurrentLogier(EnumClientType.Wxmp);
}
/// <summary>
@@ -249,9 +256,10 @@
Type = EnumUserType.Personal,
UserName = request.PhoneNumber,
PhoneNumber = request.PhoneNumber,
+ ContactPhoneNumber = request.PhoneNumber,
IsCheckPhoneNumber = true,
Level = 1,
- Status = EnumUserStatus.Normal
+ Status = EnumUserStatus.Normal,
};
await rep.InsertAsync(user);
@@ -270,43 +278,54 @@
.GetDetail<User, GetPersonalLoginInfoQueryResult>(cancellationToken);
var taskUserQueryable = rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
.Where(it => it.EnterpriseEmployee.UserId == model.Id);
- model.TaskCount = await taskUserQueryable.CountAsync();
- model.HirePassTaskCount = await taskUserQueryable.CountAsync(it => it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass);
- model.HireRefuseTaskCount = await taskUserQueryable.CountAsync(it => it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Refuse);
+ model.TaskCount = await taskUserQueryable.CountAsync(tu =>
+ tu.HireStatus == EnumTaskUserHireStatus.Wait
+ || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait);
+ model.HirePassTaskCount = await taskUserQueryable.CountAsync(tu =>
+ tu.ArrangeStatus == EnumTaskUserArrangeStatus.Complete);
+ model.HireRefuseTaskCount = await taskUserQueryable.CountAsync(tu =>
+ tu.HireStatus == EnumTaskUserHireStatus.Refuse
+ || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Refuse
+ || tu.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Refuse);
+ model.Balance = await repUserWallet.AsQueryable().AsNoTracking()
+ .Where(it => it.UserId == model.Id)
+ .Select(it => it.Balance)
+ .FirstOrDefaultAsync();
+ model.RealStatus = await repUserAuth.AsQueryable().AsNoTracking()
+ .Where(it => it.Id == model.Id)
+ .Select(it => it.RealStatus)
+ .FirstOrDefaultAsync();
return model;
}
/// <summary>
- /// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ /// 鏌ヨ浼佷笟鐢ㄦ埛鐧诲綍淇℃伅
/// </summary>
- /// <param name="user"></param>
- /// <param name="clientType"></param>
- /// <param name="session_key"></param>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
/// <returns></returns>
- private LoginCommandCallback GetCurrentLogier(User user, EnumClientType clientType, string? session_key = null)
+ public async Task<GetEnterpriseLoginInfoQueryResult> Handle(GetEnterpriseLoginInfoQuery request, CancellationToken cancellationToken)
{
- var logier = new CurrentLogier
- {
- Id = user.Id,
- Avatar = user.Avatar,
- Name = user.Name,
- UserName = user.UserName,
- PhoneNumber = user.PhoneNumber,
- Level = user.Level,
- Type = user.Type,
- ClientType = clientType,
- EnterpriseId = user.EnterpriseId,
- };
- JwtUtils.GenerateToken(logier);
-
- return new LoginCommandCallback
- {
- Id = logier.Id,
- AccessToken = logier.AccessToken,
- RefreshToken = logier.RefreshToken,
- SessionKey = session_key,
- IsBindPhoneNumber = logier.PhoneNumber.IsNotNull()
- };
+ var logier = JwtUtils.GetCurrentLogier();
+ var model = await rep.AsQueryable().AsNoTracking()
+ .Where(it => it.Id == logier.Id)
+ .GetDetail<User, GetEnterpriseLoginInfoQueryResult>(cancellationToken);
+ model.Roles = await rep.Change<Role>().AsQueryable().AsNoTracking()
+ .Where(it => it.UserRoles.Any(ur => ur.UserId == logier.Id))
+ .Select(it => it.Name)
+ .ToListAsync();
+ var collects = await rep.Change<EnterpriseUserCollect>().AsQueryable().AsNoTracking()
+ .Where(it => it.EnterpriseId == logier.EnterpriseId)
+ .Select(it => new
+ {
+ it.UserId,
+ it.IsCollected,
+ it.IsContacted
+ })
+ .ToListAsync();
+ model.CollectedUserCount = collects.Count(it => it.IsCollected);
+ model.ContactedRecordCount = collects.Count(it => it.IsContacted);
+ return model;
}
}
}
--
Gitblit v1.9.1