From 5c45bc53e2c18e45130c21048df4af4896455c6d Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 15:58:48 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs |   63 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index 5e369b4..c8116c9 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
@@ -23,6 +23,8 @@
     /// </summary>
     public class LoginCommandHandler(
         IRepository<User> rep,
+        IRepository<UserAuth> repUserAuth,
+        IRepository<UserWallet> repUserWallet,
         SmsUtils smsUtils,
         WxmpUtils wxmpUtils) :
         IRequestHandler<PasswordLoginCommand, LoginCommandCallback>,
@@ -35,6 +37,8 @@
         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;
 
@@ -54,7 +58,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>
@@ -78,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>
@@ -113,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>
@@ -218,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>
@@ -255,7 +259,7 @@
                 ContactPhoneNumber = request.PhoneNumber,
                 IsCheckPhoneNumber = true,
                 Level = 1,
-                Status = EnumUserStatus.Normal
+                Status = EnumUserStatus.Normal,
             };
             await rep.InsertAsync(user);
 
@@ -283,6 +287,20 @@
                 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();
+            var auth = await repUserAuth.AsQueryable().AsNoTracking()
+                .Where(it => it.Id == model.Id)
+                .Select(it => new
+                {
+                    it.RealStatus,
+                    it.RealFailMessage
+                })
+                .FirstOrDefaultAsync();
+            model.RealStatus = auth?.RealStatus ?? EnumPersonalUserRealStatus.UnReal;
+            model.RealFailMessage = auth?.RealFailMessage;
             return model;
         }
 
@@ -314,39 +332,6 @@
             model.CollectedUserCount = collects.Count(it => it.IsCollected);
             model.ContactedRecordCount = collects.Count(it => it.IsContacted);
             return model;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
-        /// </summary>
-        /// <param name="user"></param>
-        /// <param name="clientType"></param>
-        /// <param name="session_key"></param>
-        /// <returns></returns>
-        private LoginCommandCallback GetCurrentLogier(User user, EnumClientType clientType, string? session_key = null)
-        {
-            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()
-            };
         }
     }
 }

--
Gitblit v1.9.1