From d5fe1b8b4de07a9ceeee5bba65677f5c0b5e9d5d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 31 三月 2025 10:14:56 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3
---
LifePayment/LifePayment.Application/User/AccountService.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs
index 7ddb6db..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;
@@ -105,7 +110,6 @@
/// <exception cref="UserFriendlyException"></exception>
public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input)
{
- string[] channlesNum = new string[0];
var lifeUser = await _lifePayUserRepository.Where(x => x.PhoneNumber == input.PhoneNumber).FirstOrDefaultAsync();
if (lifeUser == null)
{
@@ -125,21 +129,56 @@
lifeUser.LastLoginTime = DateTime.Now;
await _lifePayUserRepository.UpdateAsync(lifeUser);
}
+
+ 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 => s.ChannleId).ToArrayAsync();
+ 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()
{
- UserId = lifeUser.Id,
IsBackClientUser = backClientUser == null ? false : true,
ChannlesNum = channlesNum
};
-
-
return result;
}
--
Gitblit v1.9.1