Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

lingling

2025-03-19 6831e003276b2d582d9f242462c3dde23d29285c

Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs

@@ -127,12 +127,12 @@
    /// <summary>
    /// 最后登录渠道
    /// </summary>
    public string CreationChannle { get; set; }
    public string? CreationChannle { get; set; }

    /// <summary>
    /// 最后登录渠道
    /// </summary>
    public string LastLoginChannle { get; set; }
    public string? LastLoginChannle { get; set; }

    public DateTime? LastLoginTime { get; set; }


 LifePayment/LifePayment.Application.Contracts/User/QrCodeLogin.cs

@@ -75,6 +75,11 @@
        public string[] RoleNames { get; set; }

        /// <summary>
        /// 渠道列表
        /// </summary>
        public Guid[] ChannlesId { get; set; }

        /// <summary>
        /// 小程序OpenId
        /// </summary>
        public string OpenId { get; set; }

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -171,13 +171,12 @@
    /// <returns></returns>
    public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input)
    {
        var channel = await _lifePayChannlesRep.ToListAsync();
        return await _lifePayUserRepository.Select(x =>
                                                   new UserListOutput()
                                                   {
                                                       Id = x.Id,
                                                       //CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
                                                       //LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
                                                       CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
                                                       LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
                                                       PhoneNumber = x.PhoneNumber,
                                                       CreationTime = x.CreationTime,
                                                       LastLoginTime = x.LastLoginTime

 LifePayment/LifePayment.Application/User/AccountService.cs

@@ -6,6 +6,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Volo.Abp;
@@ -27,6 +28,7 @@
        private readonly IConfiguration _configuration;
        private readonly IIdentityModelAuthenticationService _authenticator;
        private readonly IRepository<User, Guid> _userRepository;
        private readonly IRepository<UserChannle, Guid> _userChannleRep;
        private readonly IIdentityUserAppService _identityUserService;

        public AccountService(
@@ -35,7 +37,8 @@
               IIdentityModelAuthenticationService authenticator,
               IRepository<User, Guid> userRepository,
               IIdentityUserAppService identityUserService,
               IRepository<LifePayUser, Guid> lifePayUserRepository)
               IRepository<LifePayUser, Guid> lifePayUserRepository,
               IRepository<UserChannle, Guid> userChannleRep)
        {
            _configuration = configuration;
            _wxManager = wxManager;
@@ -43,6 +46,7 @@
            _lifePayUserRepository = lifePayUserRepository;
            _authenticator = authenticator;
            _userRepository = userRepository;
            _userChannleRep = userChannleRep;
        }

        #region 查询
@@ -170,6 +174,19 @@
                DepartmentOrgId = input.ClientId == LifePaymentConstant.ClientId.Back ? input.DepartmentOrgId : null,
                CompanyOrgId = input.ClientId == LifePaymentConstant.ClientId.Back ? input.CompanyOrgId : null
            });

            List<UserChannle> userChannles = new List<UserChannle>();
            foreach (var item in input.ChannlesId)
            {
                userChannles.Add(new UserChannle()
                {
                    Id = Guid.NewGuid(),
                    ChannleId = item,
                    UserId = user.Id
                });
            }

            await _userChannleRep.InsertManyAsync(userChannles);
            //if (input.ClientId == Constant.ClientType.Back)
            //{
            //    await _distributedEventBus.PublishAsync(new SendPhoneMessageInput

 LifePayment/LifePayment.Domain/LifePay/LifePayUser.cs

@@ -23,7 +23,7 @@
        /// <summary>
        /// 注册渠道编号
        /// </summary>
        public string CreationChannleNum { get; set; }
        public string? CreationChannleNum { get; set; }

        public string UnionId { get; set; }

@@ -32,6 +32,6 @@
        /// <summary>
        /// 最后登录渠道编号
        /// </summary>
        public string LastLoginChannleNum { get; set; }
        public string? LastLoginChannleNum { get; set; }
    }
}