生活缴费api
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhengyuxuan
2025-04-03 06f7ccdea12e211d05f6eef75e6e2fb4b493377c 
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs


@@ -28,6 +28,9 @@


using NPOI.SS.Formula.Functions;


using StackExchange.Redis;


using static Volo.Abp.Identity.Settings.IdentitySettingNames;


using static Microsoft.EntityFrameworkCore.DbLoggerCategory;


using LifePayment.Application.LifePay;


using Alipay.AopSdk.Core.Domain;




namespace LifePayment.Application;




@@ -45,6 +48,8 @@


    private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;


    private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;


    private readonly IRepository<OperateHistory, Guid> _operateHistory;


    private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;


    private readonly ILifePayOrderService _lifePayOrderService;


    private readonly IDataFilter dataFilter;


    private readonly IChannelFilter _channelFilter;


    private readonly IAliPayApi _aliPayApi;


@@ -63,7 +68,9 @@


                          IRepository<LifePayUser, Guid> lifePayUserRepository,


                          IRepository<LifePayPremium, Guid> lifePayPremiumRepository,


                          IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,


                          IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,


                          IRepository<OperateHistory, Guid> operateHistory,


                          ILifePayOrderService lifePayOrderService,


                          IAliPayApi aliPayApi,


                          IAlipayInterfaceManager aliPayInterfaceManager,


                          IWxPayApi wxPayApi,


@@ -79,9 +86,11 @@


        _lifePayRateRepository = lifePayRateRepository;


        _lifePayOrderRepository = lifePayOrderRepository;


        _lifePayUserRepository = lifePayUserRepository;


        _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;


        _lifePayPremiumRepository = lifePayPremiumRepository;


        _lifePayIntroInfoRepository = lifePayIntroInfoRepository;


        _aliPayApi = aliPayApi;


        _lifePayOrderService = lifePayOrderService;


        _alipayInterfaceManager = aliPayInterfaceManager;


        _wxPayApi = wxPayApi;


        _wxPayOptions = wxPayOptions.Value;


@@ -151,7 +160,7 @@


    /// <returns></returns>


    public async Task<List<LifePayRateListOutput>> GetRate()


    {


        return await _lifePayRateRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })


        return await _lifePayRateRepository.Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })


                                           .ToListAsync();


    }




@@ -161,7 +170,7 @@


    /// <returns></returns>


    public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)


    {


        return _lifePayChannlesRep.Where(x => x.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })


        return _lifePayChannlesRep.Where(x => x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })


                                           .FirstOrDefault();


    }




@@ -171,7 +180,7 @@


    /// <returns></returns>


    public async Task<List<LifePayPremiumListOutput>> GetPremium()


    {


        return await _lifePayPremiumRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })


        return await _lifePayPremiumRepository.Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })


                                           .ToListAsync();


    }




@@ -181,7 +190,7 @@


    /// <returns></returns>


    public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum lifePayType)


    {


        return await _lifePayIntroInfoRepository.Where(x => x.IsDeleted == false && x.LifePayType == lifePayType).OrderBy(x => x.Sequence)


        return await _lifePayIntroInfoRepository.Where(x => x.LifePayType == lifePayType).OrderBy(x => x.Sequence)


            .Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType, Path = x.Path, Sequence = x.Sequence })


                                           .ToListAsync();


    }


@@ -193,7 +202,7 @@


    /// <returns></returns>


    public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)


    {


        return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository).Where(x => x.IsDeleted == false)


        return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository)


            .WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) || x.Name.Contains(input.QueryCondition))


            .WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)


            .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)


@@ -319,7 +328,7 @@


                                            .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)


                                            .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)


                                            .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)


                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))


                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.RefundOrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))


                            join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp


                            from b in temp.DefaultIfEmpty()


                            select new LifePayOrderListOutput


@@ -458,7 +467,7 @@


        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();


        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.供应商折扣价);


        var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);


        var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();


        var premium = await _lifePayPremiumRepository.Where(x => x.PremiumType == order.LifePayType).FirstOrDefaultAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");


        var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);




@@ -598,9 +607,9 @@


        return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);


    }




    public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()


    public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)


    {


        return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.启用).ToListAsync();


        return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue,x => x.Status == input.Status).ToListAsync();


    }




    public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)


@@ -660,7 +669,7 @@


            return new PageOutput<UserAccountOutput>();


        }




        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.IsDeleted == false)


        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId)


                                            .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayType == input.LifePayOrderType)


                                            .OrderByDescending(x => x.CreationTime)


                                            .Select(x =>


@@ -687,7 +696,7 @@


            return new List<UserAccountOutput>();


        }




        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.IsDeleted == false)


        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId)


                                            .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayType == input.LifePayOrderType)


                                            .OrderByDescending(x => x.CreationTime)


                                            .Select(x =>


@@ -840,7 +849,24 @@


    /// <returns></returns>


    public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)


    {


        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo || x.RefundOrderNo == input.OutRefundNo).FirstOrDefaultAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "未找到订单信息");


        input.OutTradeNo = order.OrderNo;


        input.OutRefundNo = order.RefundOrderNo;


        var result = await _aliPayApi.QueryAlipayTradeRefund(input);


        if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)


        {


            order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


            order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()


            {


                OrderNo = order.RefundOrderNo,


                OutOrderNo = result.TradeNo,


                LifePayType = LifePayTypeEnum.AliPay,


                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts


            });


        }




        return result;


    }




@@ -851,7 +877,24 @@


    /// <returns></returns>


    public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)


    {


        return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);


        var order = await _lifePayOrderRepository.Where(x => x.RefundOrderNo == outTradeNo).FirstOrDefaultAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "未找到订单信息");


        var result = await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);


        if (order.LifePayRefundStatus != LifePayRefundStatusEnum.已退款 && result.Code == WxpayResultCode.Success && result.Status == WxPayRefundStatus.退款成功)


        {


            order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


            order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()


            {


                OrderNo = order.OrderNo,


                OutRefundNo = order.RefundOrderNo,


                OutOrderNo = order.OutOrderNo,


                LifePayType = LifePayTypeEnum.AliPay,


                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts


            });


        }


        return result;




    }




    /// <summary>


@@ -863,6 +906,8 @@


    {


        return await _wxPayApi.WxPayTradeQuery(outTradeNo);


    }




  




    #endregion




@@ -884,10 +929,11 @@


        var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);


        CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "渠道不存在");




        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder && x.PayStatus == LifePayStatusEnum.已支付


        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder 


        && x.PayStatus == LifePayStatusEnum.已支付


        && x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中


        && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();


         CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");


        && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).AnyAsync();


         CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "您有同户号订单正在充值中，请勿重复充值");




        //var rate = await GetRate();


        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


@@ -947,8 +993,8 @@


        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder && x.PayStatus == LifePayStatusEnum.已支付


         && x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)


         && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");


         && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).AnyAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "您有同户号订单正在充值中，请勿重复充值");






        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认电费折扣);


@@ -1001,8 +1047,8 @@


        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");


        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.GasOrder && x.PayStatus == LifePayStatusEnum.已支付


        && x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)


        && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).ToListAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");


        && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).AnyAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "您有同户号订单正在充值中，请勿重复充值");






        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认燃气折扣);


@@ -1085,7 +1131,6 @@


        CheckExtensions.IfTrueThrowUserFriendlyException(order.ACOOLYStatus != ACOOLYStatusEnum.部分充值成功, "该订单无法修改到账金额");




        order.ActualReceivedAmount = input.ActualReceivedAmount;




        await _lifePayOrderRepository.UpdateAsync(order);




        return Constant.SUCCESS;


@@ -1149,11 +1194,7 @@


            OutOrderNo = orderNo


        };


        var result = await _aCOOLYManager.ConfirmElectricOrder(requestInput);


#if DEBUG




        _logger.LogInformation($"CreateACOOLYElectricOrder:{JsonConvert.SerializeObject(result)}");




#endif




        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),


                                                        result.Message);


@@ -1273,6 +1314,7 @@


        order.PayStatus = LifePayStatusEnum.已支付;


        order.PayTime = DateTime.Now;


        order.OutOrderNo = outOrderNo;




        try


        {


            var result = (Code: "Fail", RequestNo: "", ACOOLYOrderNo: "");


@@ -1296,19 +1338,26 @@


            //SetOrderStatus(order, result.Code);


            order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;


            order.ACOOLYOrderNo = result.ACOOLYOrderNo;


            order.ACOOLYStatus = ACOOLYStatusEnum.充值中;




            /// 创建生活缴费消费记录


            await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.充值中, order.OrderNo, order.ACOOLYOrderNo,


                                order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);


        }


        catch (Exception ex)


        {


            _logger.LogError(ex, "处理生活缴费支付成功回调时异常");


            order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;


            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;


            order.ACOOLYStatus = ACOOLYStatusEnum.充值失败;


            order.RefundApplyRemark = ex.Message;


        }




        _logger.LogError("生活缴费订单状态：" + order.LifePayOrderStatus.ToString());


        await _lifePayOrderRepository.UpdateAsync(order);


    }




    public async Task WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)


    public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)


    {


        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");


@@ -1317,14 +1366,16 @@


        {


            case LifePayRefundStatusEnum.已退款:


                order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


                order.ACOOLYStatus = ACOOLYStatusEnum.已退款;


                order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


                break;


            case LifePayRefundStatusEnum.退款中:


                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                break;


            default: break;


        }


    }






    /// <summary>


    /// ACOOLYO订单通知处理


@@ -1337,10 +1388,10 @@


        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();


        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");




        //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成)


        //{


        //    return;


        //}


        if (order.LifePayOrderStatus >= LifePayOrderStatusEnum.已完成)


        {


            return;


        }




        order.PlatformDeductionAmount = payAmount;


        if (acoolyOrderNo.IsNotNullOrEmpty())


@@ -1362,6 +1413,32 @@


        order.ACOOLYStatus = acoolyStatus;


        order.FinishTime = DateTime.Now;


        await _lifePayOrderRepository.UpdateAsync(order);




        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成)


        {


            ///结算渠道佣金


            /// 毛利


            var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100;


            /// 渠道佣金  （(充值面额 * 渠道折扣比例)-(充值面额 * 平台折扣比例)）* 佣金比例


            var channlesRakePrice = grossProfit * (order.ChannlesRakeRate) / 100;


            if (channlesRakePrice.HasValue)


            {


                LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()


                {


                    OrderNo = order.OrderNo,


                    PayAmount = order.RechargeAmount ?? 0,


                    ChannlesRakeRate = order.ChannlesRakeRate ?? 0,


                    ChannlesRakePrice = channlesRakePrice ?? 0,


                    FinishTime = order.FinishTime.Value,


                    ChannelId = order.ChannelId,


                };


                await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);


            }


        }




        /// 创建生活缴费消费记录


        await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,


                    order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);


    }




    /// <summary>


@@ -1396,25 +1473,30 @@


        }




        var outRefundNo = order.ChannelId + CreateRefundOrderNo();


        order.RefundOrderNo = outRefundNo;


        switch (order.LifePayType)


        {


            case LifePayTypeEnum.WxPay:


                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo, order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));


                if (wxRefundResult.Status == "SUCCESS")


                if (wxRefundResult.Status == WxpayRefundResultStatus.SUCCESS)


                {


                    order.RefundOrderNo = outRefundNo;


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                }


                else if (wxRefundResult.Status == WxpayRefundResultStatus.PROCESSING)


                {


                    order.RefundOrderNo = outRefundNo;


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                }


                else if (wxRefundResult.Status.IsNullOrEmpty() && wxRefundResult.Message == WxpayRefundResultMessage.FullRefund)


                {


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


                }


                else if (wxRefundResult.Status == "PROCESSING")


                {


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                }


                else


                {


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;


                    throw new UserFriendlyException("退款失败:" + wxRefundResult.Message);


                }




                break;


@@ -1425,8 +1507,9 @@


                    throw new UserFriendlyException("退款失败:" + aliRefundResult.SubMsg);


                }




                order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


                order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


                order.RefundOrderNo = outRefundNo;


                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                break;


            default: throw new UserFriendlyException("退款失败");


        }


@@ -1532,9 +1615,9 @@


            var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)


                                            .FirstOrDefaultAsync();


            CheckExtensions.IfTrueThrowUserFriendlyException(userAccount == null, "户号不存在");


            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id && x.IsDeleted == false)


                                            .FirstOrDefaultAsync();


            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");


            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id)


                                            .AnyAsync();


            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent, "户号已存在");




            userAccount.LifePayType = input.LifePayType;


            userAccount.Content = input.Content;


@@ -1547,8 +1630,8 @@


        else


        {


            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)


                                            .FirstOrDefaultAsync();


            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");


                                            .AnyAsync();


            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent, "户号已存在");


            var userAccount = new LifePayAccount


            {


                Id = Guid.NewGuid(),


@@ -1564,7 +1647,7 @@


            await _lifePayAccount.InsertAsync(userAccount);


        }




        if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder)


        if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder || input.LifePayType == LifePayOrderTypeEnum.ElectricOrder)


        {


            var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);


            if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)


@@ -1590,6 +1673,7 @@


        userAccount.DeleterId = userAccount.UserId;


        userAccount.DeletionTime = DateTime.Now;


        userAccount.IsDeleted = true;




        return Constant.SUCCESS;


    }




@@ -1623,9 +1707,7 @@


            await _lifePayOrderRepository.UpdateAsync(order);




            #region 记录日志




            await PublishLifePayOrderHistoryEvent("退款驳回", "退款", order.Id);




            await LifePayOrderHistory("退款驳回", "退款驳回", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);


            #endregion


        }


        else


@@ -2006,7 +2088,6 @@


        return message;


    }






    private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)


    {


        var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();


@@ -2142,7 +2223,7 @@


        var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;




        /// 利润


        var profit = grossProfit - channlesRakePrice - (premiumRate);


        var profit = grossProfit - channlesRakePrice - premiumPrice;




        return new OrderPriceReturn()


        {


@@ -2176,7 +2257,7 @@


        CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "当前订单已选择支付类型");




        order.LifePayType = lifePayType;


        var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();


        var premium = await _lifePayPremiumRepository.Where(x => x.PremiumType == order.LifePayType).FirstOrDefaultAsync();


        order.PremiumRate = premium == null ? 0 : premium.Rate;


        await _lifePayOrderRepository.UpdateAsync(order);