LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
LifePayment/LifePayment.Application/User/AccountService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1152,4 +1152,22 @@ /// 记账时间 /// </summary> public DateTime CreationTime { get; set; } } public class LifePayPhoneMesssageCodeLoginOutput { /// <summary> /// 用户Id /// </summary> public Guid UserId { get; set; } /// <summary> /// 是否是后台用户 /// </summary> public bool IsBackClientUser { get; set; } /// <summary> /// 渠道号 /// </summary> public string[] ChannlesNum { get; set; } } LifePayment/LifePayment.Application.Contracts/User/IAccountService.cs
@@ -19,7 +19,7 @@ /// <param name="input"></param> /// <returns></returns> /// <exception cref="UserFriendlyException"></exception> Task<Guid> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input); Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input); Task<IdentityModelTokenCacheItem> GetTokenForWeb(AccessRequestDto accessRequestDto, string webClientIp); LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -932,7 +932,7 @@ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.电费订单 && x.PayStatus == LifePayStatusEnum.已支付 && x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync(); CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中,请勿重复充值"); CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中,请勿重复充值"); var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认电费折扣); LifePayment/LifePayment.Application/User/AccountService.cs
@@ -103,17 +103,9 @@ /// <param name="input"></param> /// <returns></returns> /// <exception cref="UserFriendlyException"></exception> public async Task<Guid> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input) public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input) { //var vcodeType = VerificationCodeBusinessTypeEnum.LifePayPhoneMesssageCodeLogin; //var checkResult = await _verificationCodeManager.CheckVerificationCodeByBusinessType(vcodeType, // input.PhoneNumber, // input.Code, // true); //CheckExtensions.IfTrueThrowUserFriendlyException(!checkResult, // CustomeErrorMessage.SometingWrongOrSometing, "验证码", "已失效"); string[] channlesNum = new string[0]; var lifeUser = await _lifePayUserRepository.Where(x => x.PhoneNumber == input.PhoneNumber).FirstOrDefaultAsync(); if (lifeUser == null) { @@ -133,8 +125,22 @@ lifeUser.LastLoginTime = DateTime.Now; await _lifePayUserRepository.UpdateAsync(lifeUser); } 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(); } return lifeUser.Id; LifePayPhoneMesssageCodeLoginOutput result = new LifePayPhoneMesssageCodeLoginOutput() { UserId = lifeUser.Id, IsBackClientUser = backClientUser == null ? false : true, ChannlesNum = channlesNum }; return result; } public async Task<IdentityModelTokenCacheItem> GetTokenForWeb(AccessRequestDto accessRequestDto, string webClientIp) LifePayment/LifePayment.HttpApi/LifePay/AccountController.cs
@@ -60,7 +60,7 @@ [HttpPost] [AllowAnonymous] [ChannelFilter] public async Task<Guid> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input) public async Task<LifePayPhoneMesssageCodeLoginOutput> LifePayPhoneMesssageCodeLogin(LifePayPhoneMesssageCodeLoginInput input) { return await _accountService.LifePayPhoneMesssageCodeLogin(input); }