From e0f2b29f3349d43e7f4222e079c54ba9cc4b6ee1 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期一, 16 六月 2025 11:09:23 +0800 Subject: [PATCH] fix:支付回调及供应商回调并发问题修订 --- LifePayment/LifePayment.Application/User/AccountService.cs | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs index d65d9fa..740211b 100644 --- a/LifePayment/LifePayment.Application/User/AccountService.cs +++ b/LifePayment/LifePayment.Application/User/AccountService.cs @@ -1,6 +1,7 @@ 锘� using LifePayment.Application.Contracts; using LifePayment.Domain; +using LifePayment.Domain.LifePay; using LifePayment.Domain.Models; using LifePayment.Domain.Shared; using Microsoft.EntityFrameworkCore; @@ -36,6 +37,7 @@ private readonly IRepository<User, Guid> _userRepository; private readonly IRepository<UserChannle, Guid> _userChannleRep; private readonly IIdentityUserAppService _identityUserService; + private readonly IRepository<LifePayPromoter, Guid> lifePayPromoterRepository; private readonly IDistributedCache<string> _distributedCache; @@ -45,6 +47,7 @@ IIdentityModelAuthenticationService authenticator, IRepository<User, Guid> userRepository, IIdentityUserAppService identityUserService, + IRepository<LifePayPromoter, Guid> lifePayPromoterRepository, IRepository<LifePayUser, Guid> lifePayUserRepository, IRepository<LifePayChannles, Guid> lifePayChannlesRepository, IRepository<UserChannle, Guid> userChannleRep, @@ -53,6 +56,7 @@ _configuration = configuration; _wxManager = wxManager; _identityUserService = identityUserService; + this.lifePayPromoterRepository = lifePayPromoterRepository; _lifePayUserRepository = lifePayUserRepository; _lifePayChannlesRepository = lifePayChannlesRepository; _authenticator = authenticator; @@ -102,7 +106,8 @@ { Name = s.ChannlesName, ChannlesId = s.Id, - ChannlesNum = s.ChannlesNum + ChannlesNum = s.ChannlesNum, + SwitchType = s.SwitchType, }).ToListAsync(); BackClientUserInfoOutput result = new BackClientUserInfoOutput() @@ -162,7 +167,8 @@ { Name = s.ChannlesName, ChannlesId = s.Id, - ChannlesNum = s.ChannlesNum + ChannlesNum = s.ChannlesNum, + SwitchType = s.SwitchType, }).ToListAsync(); } @@ -176,9 +182,14 @@ var lifeUser = await _lifePayUserRepository.Where(x => x.Id == id).FirstOrDefaultAsync(); CheckExtensions.IfTrueThrowUserFriendlyException(lifeUser == null, "鐢ㄦ埛涓嶅瓨鍦�"); - var result = await LifePayUserMesssageByPhone(lifeUser.PhoneNumber); result.UserId = id; + var promoter = await lifePayPromoterRepository.FirstOrDefaultAsync(it => it.PhoneNumber == lifeUser.PhoneNumber); + if (promoter != null) + { + result.PromoterIdNumber = promoter.IdNumber; + } + return result; } @@ -194,7 +205,8 @@ { Name = s.ChannlesName, ChannlesId = s.Id, - ChannlesNum = s.ChannlesNum + ChannlesNum = s.ChannlesNum, + SwitchType = s.SwitchType, }).ToListAsync(); } -- Gitblit v1.9.1