zhengyiming
2025-03-31 d5ec56c6dd3c84b9a889af585385f3ecfee72074
LifePayment/LifePayment.Application/User/AccountService.cs
@@ -9,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Services;
@@ -93,25 +94,24 @@
            return result;
        }
        public async Task<List<ChannelOutput>> GetUserChannel()
        public async Task<BackClientUserInfoOutput> GetBackClientUserInfo()
        {
            var userchannel = await _userChannleRep.Where(x => x.UserId == CurrentUser.Id)
                .Select(s => new ChannelOutput()
                {
                    Name = _lifePayChannlesRepository.Where(x => x.ChannlesNum == s.ChannleId).Select(r => r.ChannlesName).FirstOrDefault(),
                    ChannlesNum = s.ChannleId
                }).ToListAsync();
            if (userchannel.Count() == 0)
            {
                userchannel = await _lifePayChannlesRepository
               .Select(s => new ChannelOutput()
               {
                   Name = s.ChannlesName,
                   ChannlesNum = s.ChannlesNum
               }).ToListAsync();
            }
            var channlesNums = await _userChannleRep.Where(x => x.UserId == CurrentUser.Id).Select(s => s.ChannleId).Distinct().ToListAsync();
            return userchannel;
            var channleList = await _lifePayChannlesRepository.Where(x => channlesNums.Contains(x.ChannlesNum)).Select(s => new ChannelOutput()
            {
                Name = s.ChannlesName,
                ChannlesId = s.Id,
                ChannlesNum = s.ChannlesNum
            }).ToListAsync();
            BackClientUserInfoOutput result = new BackClientUserInfoOutput()
            {
                IsBackClientUser = CurrentUser.ClientId == Constant.ClientType.Back,
                IsSystem = CurrentUser.IsSystem,
                ChannleList = channleList
            };
            return result;
        }
@@ -157,12 +157,13 @@
            && 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 channlesNums = await _userChannleRep.Where(x => x.UserId == backClientUser.Id).Select(s => s.ChannleId).Distinct().ToListAsync();
                channlesNum = await _lifePayChannlesRepository.Where(x => channlesNums.Contains(x.ChannlesNum)).Select(s => new ChannelOutput()
                {
                    Name = s.ChannlesName,
                    ChannlesId = s.Id,
                    ChannlesNum = s.ChannlesNum
                }).ToListAsync();
            }
            var result = await LifePayUserMesssageByPhone(lifeUser.PhoneNumber);
@@ -188,12 +189,13 @@
             && 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();
                var channlesNums = await _userChannleRep.Where(x => x.UserId == backClientUser.Id).Select(s => s.ChannleId).Distinct().ToListAsync();
                channlesNum = await _lifePayChannlesRepository.Where(x => channlesNums.Contains(x.ChannlesNum)).Select(s => new ChannelOutput()
                {
                    Name = s.ChannlesName,
                    ChannlesId = s.Id,
                    ChannlesNum = s.ChannlesNum
                }).ToListAsync();
            }
            LifePayPhoneMesssageCodeLoginOutput result = new LifePayPhoneMesssageCodeLoginOutput()