From 877a696655516acaa1ee19ecbc8d050394c26c2b Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期四, 27 三月 2025 17:31:52 +0800 Subject: [PATCH] fix:新增接口 --- LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs | 8 ++++ LifePayment/LifePayment.Application.Contracts/User/QrCodeLogin.cs | 9 ++++ LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 29 ++++++++++++++ LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs | 13 ++++++ LifePayment/LifePayment.Application/User/AccountService.cs | 26 +++++++++++++ LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 2 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 7 +++ LifePayment/LifePayment.Domain.Shared/LifePaymentConstant.cs | 4 +- 8 files changed, 94 insertions(+), 4 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs index 652dc01..06405b2 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs @@ -287,7 +287,7 @@ Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input); /// <summary> - /// 鏌ヨ寰俊鏀粯璁㈠崟淇℃伅 + /// 鏌ヨ寰俊閫�娆捐鍗曚俊鎭� /// </summary> /// <param name="outTradeNo"></param> /// <returns></returns> diff --git a/LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs b/LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs index e751aa2..1059078 100644 --- a/LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs +++ b/LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs @@ -21,6 +21,14 @@ /// <exception cref="UserFriendlyException"></exception> Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input); + /// <summary> + /// 鏍规嵁鐢ㄦ埛ID鑾峰彇鐢ㄦ埛鏄惁涓哄悗鍙扮鐞嗗憳 + /// </summary> + /// <param name="id"></param> + /// <returns></returns> + Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByIduser(Guid id); + + Task<IdentityModelTokenCacheItem> GetTokenForWeb(AccessRequestDto accessRequestDto, string webClientIp); Task<Guid> CreateAccount(CreateAccountInput input, bool isSend = false, bool isAdminCreate = false); diff --git a/LifePayment/LifePayment.Application.Contracts/User/QrCodeLogin.cs b/LifePayment/LifePayment.Application.Contracts/User/QrCodeLogin.cs index ff5a602..0f96d68 100644 --- a/LifePayment/LifePayment.Application.Contracts/User/QrCodeLogin.cs +++ b/LifePayment/LifePayment.Application.Contracts/User/QrCodeLogin.cs @@ -19,6 +19,15 @@ public string PhoneNumber { get; set; } } + public class LifePayUserMesssageByIduserInput : ChannelsBaseInput + { + /// <summary> + /// 鐢ㄦ埛缂栧彿 + /// </summary> + [DisplayName("鐢ㄦ埛缂栧彿")] + public Guid Id { get; set; } + } + public class WxMiniAppIndentityInfo { /// <summary> diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs index 7ddb6db..ac9b944 100644 --- a/LifePayment/LifePayment.Application/User/AccountService.cs +++ b/LifePayment/LifePayment.Application/User/AccountService.cs @@ -16,6 +16,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; @@ -143,6 +144,31 @@ return result; } + public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByIduser(Guid id) + { + string[] channlesNum = new string[0]; + var lifeUser = await _lifePayUserRepository.Where(x => x.Id == id).FirstOrDefaultAsync(); + CheckExtensions.IfTrueThrowUserFriendlyException(lifeUser == null, + "鐢ㄦ埛涓嶅瓨鍦�"); + var backClientUser = await _userRepository.Where(x => x.ClientId == Constant.ClientType.Back + && x.PhoneNumber == lifeUser.PhoneNumber).FirstOrDefaultAsync(); + if (backClientUser != null) + { + channlesNum = await _userChannleRep.Where(x => x.UserId == backClientUser.Id).Select(s => s.ChannleId).ToArrayAsync(); + } + + LifePayPhoneMesssageCodeLoginOutput result = new LifePayPhoneMesssageCodeLoginOutput() + { + UserId = id, + IsBackClientUser = backClientUser == null ? false : true, + ChannlesNum = channlesNum + }; + + + return result; + } + + public async Task<IdentityModelTokenCacheItem> GetTokenForWeb(AccessRequestDto accessRequestDto, string webClientIp) { IdentityClientConfiguration config = new IdentityClientConfiguration diff --git a/LifePayment/LifePayment.Domain.Shared/LifePaymentConstant.cs b/LifePayment/LifePayment.Domain.Shared/LifePaymentConstant.cs index 676634c..d6e27cb 100644 --- a/LifePayment/LifePayment.Domain.Shared/LifePaymentConstant.cs +++ b/LifePayment/LifePayment.Domain.Shared/LifePaymentConstant.cs @@ -53,11 +53,11 @@ public const string PayTransactionsH5 = "/v3/pay/transactions/h5"; - public const string WxPayTradeQyery = "/v3/pay/transactions/out-trade-no/{out_trade_no}"; + public const string WxPayTradeQyery = "/v3/pay/transactions/out-trade-no/{0}"; public const string WxPayDomesticRefunds = "/v3/refund/domestic/refunds"; - public const string WxPayDomesticRefundsQuery = "/v3/refund/domestic/refunds/{out_refund_no}"; + public const string WxPayDomesticRefundsQuery = "/v3/refund/domestic/refunds/{0}"; public const string WxPayTradeBillApply = "/v3/fund-app/mch-transfer/elecsign/out-bill-no"; diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml index 5cd7958..c73c90b 100644 --- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml +++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml @@ -19,6 +19,13 @@ <returns></returns> <exception cref="T:Volo.Abp.UserFriendlyException"></exception> </member> + <member name="M:LifePayment.HttpApi.AccountController.LifePayUserMesssageByIduser(LifePayment.Application.Contracts.LifePayUserMesssageByIduserInput)"> + <summary> + 鏍规嵁鐢ㄦ埛ID鑾峰彇鐢ㄦ埛鏄惁涓哄悗鍙扮鐞嗗憳 + </summary> + <param name="input"></param> + <returns></returns> + </member> <member name="M:LifePayment.HttpApi.ACOOLYNotifyController.ACOOLYNotify"> <summary> ACOOLY鍥炶皟閫氱煡 diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml index 8c914a4..b9a91d2 100644 --- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml +++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml @@ -248,7 +248,7 @@ </member> <member name="M:LifePayment.Application.Contracts.ILifePayService.WxPayDomesticRefundsQuery(System.String)"> <summary> - 鏌ヨ寰俊鏀粯璁㈠崟淇℃伅 + 鏌ヨ寰俊閫�娆捐鍗曚俊鎭� </summary> <param name="outTradeNo"></param> <returns></returns> @@ -1624,6 +1624,21 @@ 璁拌处鏃堕棿 </summary> </member> + <member name="P:LifePayment.Application.Contracts.LifePayPhoneMesssageCodeLoginOutput.UserId"> + <summary> + 鐢ㄦ埛Id + </summary> + </member> + <member name="P:LifePayment.Application.Contracts.LifePayPhoneMesssageCodeLoginOutput.IsBackClientUser"> + <summary> + 鏄惁鏄悗鍙扮敤鎴� + </summary> + </member> + <member name="P:LifePayment.Application.Contracts.LifePayPhoneMesssageCodeLoginOutput.ChannlesNum"> + <summary> + 娓犻亾鍙� + </summary> + </member> <member name="P:LifePayment.Application.Contracts.RecordOperateHistoryEto.RelationId"> <summary> 鍏宠仈鍏崇郴ID @@ -2458,6 +2473,13 @@ <returns></returns> <exception cref="T:Volo.Abp.UserFriendlyException"></exception> </member> + <member name="M:LifePayment.Application.Contracts.IAccountService.LifePayUserMesssageByIduser(System.Guid)"> + <summary> + 鏍规嵁鐢ㄦ埛ID鑾峰彇鐢ㄦ埛鏄惁涓哄悗鍙扮鐞嗗憳 + </summary> + <param name="id"></param> + <returns></returns> + </member> <member name="M:LifePayment.Application.Contracts.IUserRoleService.ResetPassword(LifePayment.Application.Contracts.ResetPasswordBaseInput)"> <summary> 閲嶇疆瀵嗙爜 @@ -2470,6 +2492,11 @@ 鎵嬫満鍙� </summary> </member> + <member name="P:LifePayment.Application.Contracts.LifePayUserMesssageByIduserInput.Id"> + <summary> + 鐢ㄦ埛缂栧彿 + </summary> + </member> <member name="P:LifePayment.Application.Contracts.WxMiniAppIndentityInfo.SessionKey"> <summary> 浼氳瘽瀵嗛挜 diff --git a/LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs b/LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs index c0407bc..c61fc5b 100644 --- a/LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs +++ b/LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs @@ -65,6 +65,19 @@ return await _accountService.LifePayPhoneMesssageCodeLogin(input); } + /// <summary> + /// 鏍规嵁鐢ㄦ埛ID鑾峰彇鐢ㄦ埛鏄惁涓哄悗鍙扮鐞嗗憳 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + [AllowAnonymous] + [ChannelFilter] + public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayUserMesssageByIduser(LifePayUserMesssageByIduserInput input) + { + return await _accountService.LifePayUserMesssageByIduser(input.Id); + } + [HttpPost] public OssSTSReponse GetOssSTS() { -- Gitblit v1.9.1