From d6ffbd97603decf4d3922a697414f4f7cec30434 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 28 三月 2025 11:13:26 +0800
Subject: [PATCH] fix:获取用户是否为管理员返回值优化
---
LifePayment/LifePayment.Application/User/AccountService.cs | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs
index 11dcf39..951403b 100644
--- a/LifePayment/LifePayment.Application/User/AccountService.cs
+++ b/LifePayment/LifePayment.Application/User/AccountService.cs
@@ -5,6 +5,7 @@
using LifePayment.Domain.Shared;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
+using Nest;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,6 +17,7 @@
using Volo.Abp.Identity;
using Volo.Abp.Identity.Application.Contracts.Account;
using Volo.Abp.IdentityModel;
+using Volo.Abp.Threading;
using ZeroD.Util;
using ZeroD.Util.Fadd;
using static LifePayment.Domain.Shared.LifePaymentConstant;
@@ -27,6 +29,7 @@
{
private readonly IWxManager _wxManager;
private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
+ private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRepository;
private readonly IConfiguration _configuration;
private readonly IIdentityModelAuthenticationService _authenticator;
private readonly IRepository<User, Guid> _userRepository;
@@ -42,6 +45,7 @@
IRepository<User, Guid> userRepository,
IIdentityUserAppService identityUserService,
IRepository<LifePayUser, Guid> lifePayUserRepository,
+ IRepository<LifePayChannles, Guid> lifePayChannlesRepository,
IRepository<UserChannle, Guid> userChannleRep,
IDistributedCache<string> distributedCache)
{
@@ -49,6 +53,7 @@
_wxManager = wxManager;
_identityUserService = identityUserService;
_lifePayUserRepository = lifePayUserRepository;
+ _lifePayChannlesRepository = lifePayChannlesRepository;
_authenticator = authenticator;
_userRepository = userRepository;
_userChannleRep = userChannleRep;
@@ -103,17 +108,8 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task<Guid> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input)
+ public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input)
{
- //var vcodeType = VerificationCodeBusinessTypeEnum.LifePayPhoneMesssageCodeLogin;
-
- //var checkResult = await _verificationCodeManager.CheckVerificationCodeByBusinessType(vcodeType,
- // input.PhoneNumber,
- // input.Code,
- // true);
- //CheckExtensions.IfTrueThrowUserFriendlyException(!checkResult,
- // CustomeErrorMessage.SometingWrongOrSometing, "楠岃瘉鐮�", "宸插け鏁�");
-
var lifeUser = await _lifePayUserRepository.Where(x => x.PhoneNumber == input.PhoneNumber).FirstOrDefaultAsync();
if (lifeUser == null)
{
@@ -134,7 +130,56 @@
await _lifePayUserRepository.UpdateAsync(lifeUser);
}
- return lifeUser.Id;
+ List<ChannelOutput> channlesNum = new List<ChannelOutput>();
+ var backClientUser = await _userRepository.Where(x => x.ClientId == Constant.ClientType.Back
+ && x.PhoneNumber == input.PhoneNumber).FirstOrDefaultAsync();
+ if (backClientUser != null)
+ {
+ channlesNum = await _userChannleRep.Where(x => x.UserId == backClientUser.Id)
+ .Select(s => new ChannelOutput()
+ {
+ Name = _lifePayChannlesRepository.Where(x => x.ChannlesNum == s.ChannleId).Select(r => r.ChannlesName).FirstOrDefault(),
+ ChannlesNum = s.ChannleId
+ }).ToListAsync();
+ }
+
+ var result = await LifePayUserMesssageByPhone(lifeUser.PhoneNumber);
+ result.UserId = lifeUser.Id;
+ return result;
+ }
+
+ public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByIduser(Guid id)
+ {
+ var lifeUser = await _lifePayUserRepository.Where(x => x.Id == id).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(lifeUser == null,
+ "鐢ㄦ埛涓嶅瓨鍦�");
+
+ var result = await LifePayUserMesssageByPhone(lifeUser.PhoneNumber);
+ result.UserId = id;
+ return result;
+ }
+
+ public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByPhone(string phoneNumber)
+ {
+ List<ChannelOutput> channlesNum = new List<ChannelOutput>();
+ var backClientUser = await _userRepository.Where(x => x.ClientId == Constant.ClientType.Back
+ && x.PhoneNumber == phoneNumber).FirstOrDefaultAsync();
+ if (backClientUser != null)
+ {
+ channlesNum = await _userChannleRep.Where(x => x.UserId == backClientUser.Id)
+ .Select(s => new ChannelOutput()
+ {
+ Name = _lifePayChannlesRepository.Where(x => x.ChannlesNum == s.ChannleId).Select(r => r.ChannlesName).FirstOrDefault(),
+ ChannlesNum = s.ChannleId
+ }).ToListAsync();
+ }
+
+ LifePayPhoneMesssageCodeLoginOutput result = new LifePayPhoneMesssageCodeLoginOutput()
+ {
+ IsBackClientUser = backClientUser == null ? false : true,
+ ChannlesNum = channlesNum
+ };
+ return result;
}
public async Task<IdentityModelTokenCacheItem> GetTokenForWeb(AccessRequestDto accessRequestDto, string webClientIp)
--
Gitblit v1.9.1