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


@@ -27,6 +27,9 @@


using Volo.Abp.ObjectMapping;


using NPOI.SS.Formula.Functions;


using StackExchange.Redis;


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


using static Microsoft.EntityFrameworkCore.DbLoggerCategory;


using LifePayment.Application.LifePay;




namespace LifePayment.Application;




@@ -44,12 +47,15 @@


    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;


    private readonly IAlipayInterfaceManager _alipayInterfaceManager;


    private readonly IWxPayApi _wxPayApi;


    private readonly WxPayOption _wxPayOptions;


    private readonly InitSetting _initSettingOptions;




    private readonly IACOOLYManager _aCOOLYManager;




@@ -61,11 +67,14 @@


                          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,


                          IOptions<WxPayOption> wxPayOptions,


                          IOptions<InitSetting> initSettingOptions,


                          IRepository<LifePayChannles, Guid> lifePayChannlesRep,


                          IRepository<LifePayAccount, Guid> lifePayAccount,


                          IDataFilter dataFilter,


@@ -76,12 +85,15 @@


        _lifePayRateRepository = lifePayRateRepository;


        _lifePayOrderRepository = lifePayOrderRepository;


        _lifePayUserRepository = lifePayUserRepository;


        _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;


        _lifePayPremiumRepository = lifePayPremiumRepository;


        _lifePayIntroInfoRepository = lifePayIntroInfoRepository;


        _aliPayApi = aliPayApi;


        _lifePayOrderService = lifePayOrderService;


        _alipayInterfaceManager = aliPayInterfaceManager;


        _wxPayApi = wxPayApi;


        _wxPayOptions = wxPayOptions.Value;


        _initSettingOptions = initSettingOptions.Value;


        _distributedEventBus = distributedEventBus;


        _lifePayChannlesRep = lifePayChannlesRep;


        _lifePayAccount = lifePayAccount;


@@ -157,7 +169,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.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })


                                           .FirstOrDefault();


    }




@@ -193,6 +205,8 @@


            .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)


            .WhereIf(input.LoginTimeBegin.HasValue, x => x.LastLoginTime >= input.LoginTimeBegin)


            .WhereIf(input.LoginTimeEnd.HasValue, x => x.LastLoginTime <= input.LoginTimeEnd)


                                            .Select(x =>


                                                   new UserListOutput()


                                                   {


@@ -246,6 +260,7 @@


    {


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


        var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)


                            .Where(x => x.PayStatus != LifePayStatusEnum.未支付)


                      .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)


                                            .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)


                                            .WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)


@@ -261,19 +276,19 @@


                            from b in temp.DefaultIfEmpty()


                            select new LifePayOrderListOutput


                            {


                                DiscountAmount = a.DiscountAmount,


                                DiscountAmount = a.DiscountAmount ?? 0,


                                FinishTime = a.FinishTime,


                                Id = a.Id,


                                LifePayOrderStatus = a.LifePayOrderStatus,


                                LifePayOrderStatus = a.LifePayOrderStatus?? 0,


                                LifePayOrderType = a.LifePayOrderType,


                                LifePayType = a.LifePayType,


                                OrderNo = a.OrderNo,


                                PayAmount = a.PayAmount,


                                PayAmount = a.PayAmount ?? 0,


                                PhoneNumber = a.PhoneNumber,


                                RechargeAmount = a.RechargeAmount,


                                RechargeAmount = a.RechargeAmount??0,


                                UserId = a.UserId,


                                OutOrderNo = a.OutOrderNo,


                                PayStatus = a.PayStatus,


                                PayStatus = a.PayStatus?? 0,


                                PayTime = a.PayTime,


                                ACOOLYOrderNo = a.ACOOLYOrderNo,


                                RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),


@@ -317,19 +332,19 @@


                            from b in temp.DefaultIfEmpty()


                            select new LifePayOrderListOutput


                            {


                                DiscountAmount = a.DiscountAmount,


                                DiscountAmount = a.DiscountAmount ?? 0,


                                FinishTime = a.FinishTime,


                                Id = a.Id,


                                LifePayOrderStatus = a.LifePayOrderStatus,


                                LifePayOrderStatus = a.LifePayOrderStatus ?? 0,


                                LifePayOrderType = a.LifePayOrderType,


                                LifePayType = a.LifePayType,


                                OrderNo = a.OrderNo,


                                PayAmount = a.PayAmount,


                                PayAmount = a.PayAmount ?? 0,


                                PhoneNumber = a.PhoneNumber,


                                RechargeAmount = a.RechargeAmount,


                                RechargeAmount = a.RechargeAmount ?? 0,


                                UserId = a.UserId,


                                OutOrderNo = a.OutOrderNo,


                                PayStatus = a.PayStatus,


                                PayStatus = a.PayStatus ?? 0,


                                PayTime = a.PayTime,


                                ACOOLYOrderNo = a.ACOOLYOrderNo,


                                RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),


@@ -337,6 +352,7 @@


                                RefundCheckRemark = a.RefundCheckRemark,


                                RefundApplyRemark = a.RefundApplyRemark,


                                RefundApplyTime = a.RefundApplyTime,


                                RefundOrderNo = a.RefundOrderNo,


                                RefundTime = a.RefundTime,


                                RefundPrice = a.RefundPrice,


                                ChannelName = b.ChannlesName,


@@ -365,6 +381,7 @@


            PayAmount = x.PayAmount,


            PhoneNumber = x.PhoneNumber,


            RefundOrderNo = x.RefundOrderNo,


            RefundApplyTime = x.RefundApplyTime,


            ChannelName = x.ChannelName,


            CreationTime = x.CreationTime,


            ACOOLYStatus = x.ACOOLYStatus,


@@ -382,10 +399,11 @@


            s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();


            s.RechargeAmountStr = s.RechargeAmount.ToString("F2");


            s.ActualReceivedAmount = s.ActualReceivedAmount;


            s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();


            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.无需退款 ? "" : s.LifePayRefundStatus.GetDescription();


            s.PayAmountStr = s.PayAmount.ToString("F2");


            s.LifePayTypeStr = s.LifePayType.GetDescription();


            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);


            s.RefundApplyTimeStr = !s.RefundApplyTime.HasValue ? string.Empty : s.RefundApplyTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);


        });


        return result;


    }


@@ -395,28 +413,27 @@


    {


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


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


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


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


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


        var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;


        var orderpirce = await GetOrderPrice(order.RechargeAmount, order.PayAmount,order.PlatformRate, order.ChannleRate, order.ChannlesRakeRate,order.PremiumRate);




        CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "用户不存在");


        var orderpirce = await GetOrderPrice(order.RechargeAmount ?? 0, order.PayAmount ?? 0, order.PlatformRate ?? 0, order.ChannleRate ?? 0, order.ChannlesRakeRate ?? 0, order.PremiumRate ?? 0);




        var result = new LifePayOrderOutput()


                {


        {


            UserName = user.Name,


            UserPhoneNumber = user.PhoneNumber,


            DiscountAmount = order.DiscountAmount,


            DiscountAmount = order.DiscountAmount ?? 0,


            FinishTime = order.FinishTime,


            Id = order.Id,


            OutOrderNo = order.OutOrderNo,


            LifePayChannle = channle.ChannlesName,


            Status = order.LifePayOrderStatus,


            Status = order.LifePayOrderStatus ?? 0,


            LifePayOrderType = order.LifePayOrderType,


            LifePayType = order.LifePayType,


            OrderNo = order.OrderNo,


            PayAmount = order.PayAmount,


            RechargeAmount = order.RechargeAmount,


            PayStatus = order.PayStatus,


            PayAmount = order.PayAmount ?? 0,


            RechargeAmount = order.RechargeAmount ?? 0,


            PayStatus = order.PayStatus ?? 0,


            PayTime = order.PayTime,


            OrderParamDetailJsonStr = order.OrderParamDetailJsonStr,


            RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),


@@ -437,7 +454,8 @@


            ChannlesRakePrice = orderpirce.ChannlesRakePrice,


            PremiumRate = order.PremiumRate,


            PremiumPrice = orderpirce.PremiumPrice,


            Profit = orderpirce.Profit


            Profit = orderpirce.Profit,


            RefundOrderNo = order.RefundOrderNo,


        };




        return result;


@@ -457,18 +475,18 @@


        {


            UserName = user.Name,


            UserPhoneNumber = user.PhoneNumber,


            DiscountAmount = order.DiscountAmount,


            DiscountAmount = order.DiscountAmount ?? 0,


            FinishTime = order.FinishTime,


            Id = order.Id,


            OutOrderNo = order.OutOrderNo,


            LifePayChannle = channle.ChannlesName,


            Status = order.LifePayOrderStatus,


            Status = order.LifePayOrderStatus ?? 0,


            LifePayOrderType = order.LifePayOrderType,


            LifePayType = order.LifePayType,


            OrderNo = order.OrderNo,


            PayAmount = order.PayAmount,


            RechargeAmount = order.RechargeAmount,


            PayStatus = order.PayStatus,


            PayAmount = order.PayAmount ?? 0,


            RechargeAmount = order.RechargeAmount ?? 0,


            PayStatus = order.PayStatus ?? 0,


            PayTime = order.PayTime,


            RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),


            CreationTime = order.CreationTime,


@@ -513,16 +531,16 @@


                                            .Select(x =>


                                                    new UserLifePayOrderOutput


                                                    {


                                                        DiscountAmount = x.DiscountAmount,


                                                        DiscountAmount = x.DiscountAmount ?? 0,


                                                        FinishTime = x.FinishTime,


                                                        Id = x.Id,


                                                        LifePayOrderStatus = x.LifePayOrderStatus,


                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,


                                                        LifePayOrderType = x.LifePayOrderType,


                                                        LifePayType = x.LifePayType,


                                                        OrderNo = x.OrderNo,


                                                        PayAmount = x.PayAmount,


                                                        RechargeAmount = x.RechargeAmount,


                                                        PayStatus = x.PayStatus,


                                                        PayAmount = x.PayAmount ?? 0,


                                                        RechargeAmount = x.RechargeAmount ?? 0,


                                                        PayStatus = x.PayStatus ?? 0,


                                                        PayTime = x.PayTime,


                                                        OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,


                                                        RefundCredentialsImgUrl = x.RefundCredentialsImgUrl.GetOssPath(),


@@ -544,16 +562,16 @@


                                            .Select(x =>


                                                    new UserLifePayOrderOutput


                                                    {


                                                        DiscountAmount = x.DiscountAmount,


                                                        DiscountAmount = x.DiscountAmount ?? 0,


                                                        FinishTime = x.FinishTime,


                                                        Id = x.Id,


                                                        LifePayOrderStatus = x.LifePayOrderStatus,


                                                        LifePayOrderStatus = x.LifePayOrderStatus?? 0 ,


                                                        LifePayOrderType = x.LifePayOrderType,


                                                        LifePayType = x.LifePayType,


                                                        OrderNo = x.OrderNo,


                                                        PayAmount = x.PayAmount,


                                                        RechargeAmount = x.RechargeAmount,


                                                        PayStatus = x.PayStatus,


                                                        PayAmount = x.PayAmount ?? 0,


                                                        RechargeAmount = x.RechargeAmount ?? 0,


                                                        PayStatus = x.PayStatus ?? 0,


                                                        PayTime = x.PayTime,


                                                        OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,


                                                        RefundCredentialsImgUrl = x.RefundCredentialsImgUrl.GetOssPath(),


@@ -579,7 +597,7 @@


    public async Task<LifePayStatusEnum> GetPayStatusByOrderNo(string orderNo)


    {


        return await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo)


                                            .Select(x => x.PayStatus)


                                            .Select(x => x.PayStatus ?? 0)


                                            .FirstOrDefaultAsync();


    }




@@ -635,7 +653,7 @@


                                                        OrderNo = x.OrderNo,


                                                        RefundCheckRemark = x.RefundCheckRemark,


                                                        RefundApplyRemark = x.RefundApplyRemark,


                                                        LifePayOrderStatus = x.LifePayOrderStatus,


                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,


                                                    }).FirstOrDefaultAsync();




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


@@ -724,12 +742,12 @@


        {


            DiscountAmount = x.DiscountAmount,


            FinishTime = x.FinishTime,


            //LifePayOrderStatus = x.LifePayOrderStatus,


            LifePayOrderStatus = x.LifePayOrderStatus,


            LifePayOrderType = x.LifePayOrderType,


            LifePayType = x.LifePayType,


            OrderNo = x.OrderNo,


            PayAmount = x.PayAmount,


            ActualRechargeAmount = x.ActualRechargeAmount.HasValue?x.ActualRechargeAmount.Value:0,


            ActualRechargeAmount = x.RechargeAmount,


            PhoneNumber = x.PhoneNumber,


            RechargeAmount = x.RechargeAmount,


            OutOrderNo = x.OutOrderNo,


@@ -755,9 +773,9 @@


            s.LifePayTypeStr = s.LifePayType.GetDescription();


            s.PayStatusStr = s.PayStatus.GetDescription();


            s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");


            s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();


            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.无需退款 ? "" : s.LifePayRefundStatus.GetDescription();


            s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();


            //s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();


            s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();


            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);


        });


        return result;


@@ -810,6 +828,67 @@


            return "";


        }


    }




    /// <summary>


    /// 查询支付宝支付订单信息


    /// </summary>


    /// <param name="input"></param>


    /// <returns></returns>


    public async Task<AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)


    {


        var result = await _aliPayApi.OrderInQuiry(input);




        return result;


    }




    /// <summary>


    /// 查询支付宝退款订单信息


    /// </summary>


    /// <param name="input"></param>


    /// <returns></returns>


    public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)


    {


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


        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 = result.OutTradeNo,


                OutOrderNo = result.TradeNo,


                LifePayType = LifePayTypeEnum.AliPay,


                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts


            });


        }




        return result;


    }




    /// <summary>


    /// 查询微信退款订单信息


    /// </summary>


    /// <param name="outTradeNo"></param>


    /// <returns></returns>


    public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)


    {


        return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);


    }




    /// <summary>


    /// 查询微信订单信息


    /// </summary>


    /// <param name="outTradeNo"></param>


    /// <returns></returns>


    public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)


    {


        return await _wxPayApi.WxPayTradeQuery(outTradeNo);


    }




  




    #endregion




    #region 操作


@@ -830,21 +909,26 @@


        var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);


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




        var rate = await GetRate();


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


        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, "您有同户号订单正在充值中，请勿重复充值");




        //var rate = await GetLifePayRate();


        //var rate = await GetRate();


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




        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认话费折扣).Rate);


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




        var amount = CalculateAmount(input.ProductData.ParValue, rate);




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


        






        var orderInput = new CreateLifePayOrderInput


        {


            OrderNo = channle.ChannlesNum + CreateOrderNo(),


            LifePayOrderStatus = LifePayOrderStatusEnum.充值中,


            LifePayOrderType = LifePayOrderTypeEnum.话费订单,


            LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,


            //LifePayType = input.LifePayType,


            OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),


            UserId = user.Id,


@@ -855,8 +939,8 @@


            RechargeAmount = amount.RechargeAmount,


            ChannelId = channle.ChannlesNum,


            PlatformRate = platformRate.Rate,


            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,


            ChannleRate = channle.ChannlesRate,


            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,


            ChannleRate = rate,


            ChannlesRakeRate = channle.ChannlesRakeRate,


            //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100


        };


@@ -884,18 +968,23 @@


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


        CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.禁用, "渠道已被禁用");




        var rate = await GetRate();


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


        //var rate = await GetRate();


        //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, "您有同户号订单正在充值中，请勿重复充值");




        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认电费折扣).Rate);




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


        var amount = CalculateAmount(input.ProductData.ParValue, rate);


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




        var orderInput = new CreateLifePayOrderInput


        {


            OrderNo = channle.ChannlesNum + CreateOrderNo(),


            LifePayOrderStatus = LifePayOrderStatusEnum.充值中,


            LifePayOrderType = LifePayOrderTypeEnum.电费订单,


            LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,


            // LifePayType = input.LifePayType,


            OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),


            UserId = user.Id,


@@ -906,7 +995,7 @@


            RechargeAmount = amount.RechargeAmount,


            ChannelId = channle.ChannlesNum,


            PlatformRate = platformRate.Rate,


            ChannleRate = channle.ChannlesRate,


            ChannleRate = rate,


            ChannlesRakeRate = channle.ChannlesRakeRate,


        };




@@ -933,10 +1022,17 @@


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


        CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.禁用, "渠道已被禁用");




        var rate = await GetRate();


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


        //var rate = await GetRate();


        //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, "您有同户号订单正在充值中，请勿重复充值");




        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认燃气折扣).Rate);




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




        var amount = CalculateAmount(input.ProductData.ParValue, rate);




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




@@ -944,7 +1040,7 @@


        {


            OrderNo = channle.ChannlesNum + CreateOrderNo(),


            LifePayOrderStatus = LifePayOrderStatusEnum.充值中,


            LifePayOrderType = LifePayOrderTypeEnum.燃气订单,


            LifePayOrderType = LifePayOrderTypeEnum.GasOrder,


            // LifePayType = input.LifePayType,


            OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),


            UserId = user.Id,


@@ -953,7 +1049,10 @@


            PayAmount = amount.PayAmont,


            DiscountAmount = amount.DiscountAmount,


            RechargeAmount = amount.RechargeAmount,


            ChannelId = channle.ChannlesNum


            ChannelId = channle.ChannlesNum,


            PlatformRate = platformRate.Rate,


            ChannleRate = rate,


            ChannlesRakeRate = channle.ChannlesRakeRate,


        };




        await CreateLifePayOrder(orderInput);


@@ -972,85 +1071,49 @@


    /// <returns></returns>


    public async Task<string> SetLifePayOrderPayType(SetLifePayOrderPayTypeInput input, string ip)


    {


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


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




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




        order.LifePayType = input.LifePayType;


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


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


        await _lifePayOrderRepository.UpdateAsync(order);




        var desc = "生活缴费-";


        switch (order.LifePayOrderType)


        {


            case LifePayOrderTypeEnum.话费订单:


                desc += "话费";


                break;


            case LifePayOrderTypeEnum.电费订单:


                desc += "电费";


                break;


            case LifePayOrderTypeEnum.燃气订单:


                desc += "燃气";


                break;


            default:


                break;


        }


        var res = await SetPayType(input.OrderNo, input.LifePayType, ip);




#if DEBUG


        //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);


        var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);


        var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);


#else


      //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);


        var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);


      //var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, 0.01m, ip, input.H5Type);


        var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);


#endif




        return payUrl;


    }




    /// <summary>


    /// 设置生活缴费支付类型


    /// 获取微信支付的JSAPI


    /// </summary>


    /// <param name="input"></param>


    /// <returns></returns>


    public async Task<ModelPaymentMiniPay> GetPayOrderForJsAPI(GetPayOrderForJsAPIInput input, string ip)


    {


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


        var res = await SetPayType(input.OrderNo, input.LifePayType, ip);


        var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, res.PayAmount, input.OrderNo, res.Desc);


        return result;


    }




    /// <summary>


    /// 修改实际到账金额


    /// </summary>


    /// <param name="input"></param>


    /// <returns></returns>


    public async Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input)


    {


        var order = await _lifePayOrderRepository.Where(x => x.Id == input.Id).FirstOrDefaultAsync();




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


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




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


        order.ActualReceivedAmount = input.ActualReceivedAmount;




        order.LifePayType = input.LifePayType;


        await _lifePayOrderRepository.UpdateAsync(order);




        var desc = "生活缴费-";


        switch (order.LifePayOrderType)


        {


            case LifePayOrderTypeEnum.话费订单:


                desc += "话费";


                break;


            case LifePayOrderTypeEnum.电费订单:


                desc += "电费";


                break;


            case LifePayOrderTypeEnum.燃气订单:


                desc += "燃气";


                break;


            default:


                break;


        }






        //var result = await PayTransactionsJsAPI(input.OpenId, input.Attach, 0.01m, input.OrderNo, desc);


        //return result;




        //  var result = await PayTransactionsJsAPI(input.OpenId, input.Attach,  order.PayAmount, input.OrderNo, desc);




        var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, order.PayAmount, input.OrderNo, desc);


        return result;


        //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);


        //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);




        return Constant.SUCCESS;


    }




    /// <summary>


@@ -1060,8 +1123,6 @@


    /// <returns></returns>


    public async Task CreateLifePayOrder(CreateLifePayOrderInput input)


    {


        CheckExtensions.IfTrueThrowUserFriendlyException(input.RechargeAmount < 0.01m || input.PayAmount < 0.01m || input.DiscountAmount < 0, "订单金额错误");




        var entity = ObjectMapper.Map<CreateLifePayOrderInput, LifePayOrder>(input);


        await _lifePayOrderRepository.InsertAsync(entity);


    }


@@ -1089,7 +1150,7 @@


#endif




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


                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));


                                                        result.Message);




        return (result.Code, requestInput.RequestNo, result.PhoneChargeOrder.BusiOrderNo);


    }


@@ -1120,7 +1181,7 @@


#endif




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


                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));


                                                        result.Message);




        return (result.Code, requestInput.RequestNo, result.ElectricChargeOrder.BusiOrderNo);


    }


@@ -1148,7 +1209,7 @@


#endif




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


                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));


                                                        result.Message);




        return (result.Code, requestInput.RequestNo, result.GasChargeOrder.BusiOrderNo);


    }


@@ -1242,13 +1303,13 @@


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


            switch (order.LifePayOrderType)


            {


                case LifePayOrderTypeEnum.话费订单:


                case LifePayOrderTypeEnum.PhoneOrder:


                    result = await CreateACOOLYPhoneOrder(JsonConvert.DeserializeObject<LifePhoneData>(order.OrderParamDetailJsonStr), order.OrderNo);


                    break;


                case LifePayOrderTypeEnum.电费订单:


                case LifePayOrderTypeEnum.ElectricOrder:


                    result = await CreateACOOLYElectricOrder(JsonConvert.DeserializeObject<LifeElectricData>(order.OrderParamDetailJsonStr), order.OrderNo);


                    break;


                case LifePayOrderTypeEnum.燃气订单:


                case LifePayOrderTypeEnum.GasOrder:


                    result = await CreateACOOLYGasOrder(JsonConvert.DeserializeObject<LifeGasData>(order.OrderParamDetailJsonStr), order.OrderNo);


                    break;


                default:


@@ -1259,19 +1320,20 @@


            order.LifePayOrderStatus = LifePayOrderStatusEnum.充值中;


            //SetOrderStatus(order, result.Code);


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


            order.ACOOLYOrderNo = result.ACOOLYOrderNo.IsNullOrEmpty() ? null : result.ACOOLYOrderNo;


            order.ACOOLYOrderNo = result.ACOOLYOrderNo;


        }


        catch (Exception ex)


        {


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


            order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;


            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;


            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, "订单不存在");


@@ -1285,9 +1347,10 @@


            case LifePayRefundStatusEnum.退款中:


                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                break;


            default:break;


            default: break;


        }


    }






    /// <summary>


    /// ACOOLYO订单通知处理


@@ -1295,15 +1358,15 @@


    /// <param name="orderNo"></param>


    /// <param name="outOrderNo"></param>


    /// <returns></returns>


    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount,string refundApplyRemark)


    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark)


    {


        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())


@@ -1325,6 +1388,27 @@


        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.PayAmount.Value,


                    ChannlesRakeRate = order.ChannlesRakeRate.Value,


                    ChannlesRakePrice = channlesRakePrice.Value,


                    FinishTime = order.FinishTime.Value,


                    ChannelId = order.ChannelId,


                };


                await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);


            }


        }


    }




    /// <summary>


@@ -1350,7 +1434,7 @@




        if (input.LifePayRefundType == LifePayRefundTypeEnum.全额退款)


        {


            input.RefundPrice = order.PayAmount;


            input.RefundPrice = order.PayAmount ?? 0;


        }




        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.待退款 || order.PayStatus != LifePayStatusEnum.已支付 || order.LifePayRefundStatus != LifePayRefundStatusEnum.待退款)


@@ -1359,11 +1443,10 @@


        }




        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));


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


                if (wxRefundResult.Status == "SUCCESS")


                {


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


@@ -1374,11 +1457,6 @@


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                }


                else if (wxRefundResult.Message == "订单已全额退款")


                {


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


                    order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


                }


                else


                {


                    order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;


@@ -1387,18 +1465,19 @@




                break;


            case LifePayTypeEnum.AliPay:


                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice).ToString() });


                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });


                if (aliRefundResult.Code != AlipayResultCode.Success)


                {


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


                }




                order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;


                order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;


                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;


                order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;


                break;


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


        }




        order.RefundOrderNo = outRefundNo;


        order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;


        order.RefundCheckRemark = input.RefundCheckRemark;


        order.RefundTime = DateTime.Now;


@@ -1465,7 +1544,7 @@


    /// <param name="total"></param>


    /// <param name="currency"></param>


    /// <returns></returns>


    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo,string outRefundNo, string reason, int refund, int total, string currency = "CNY")


    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string outRefundNo, string reason, int refund, int total, string currency = "CNY")


    {


        WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest


        {


@@ -1500,7 +1579,7 @@


            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)


            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, "户号已存在");




@@ -1514,7 +1593,7 @@


        }


        else


        {


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


            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, "户号已存在");


            var userAccount = new LifePayAccount


@@ -1532,7 +1611,7 @@


            await _lifePayAccount.InsertAsync(userAccount);


        }




        if (input.LifePayType == LifePayOrderTypeEnum.话费订单)


        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)


@@ -1619,7 +1698,7 @@


            dto.Status = input.Status;


            #region 记录日志




            await PublishLifePayOrderHistoryEvent("渠道管理", "编辑", input.Id.Value, TableType.LifePayChannles);


            await LifePayOrderHistory("渠道管理", "编辑", input.Id.Value, TableType.LifePayChannles);




            #endregion


        }


@@ -1632,7 +1711,7 @@




            #region 记录日志




            await PublishLifePayOrderHistoryEvent("渠道管理", "新增", input.Id.Value, TableType.LifePayChannles);


            await LifePayOrderHistory("渠道管理", "新增", input.Id.Value, TableType.LifePayChannles);




            #endregion


        }


@@ -1649,8 +1728,7 @@




        #region 记录日志




        await PublishLifePayOrderHistoryEvent("渠道管理", status.GetDescription(), id, TableType.LifePayChannles);




        await LifePayOrderHistory("渠道管理", status.GetDescription(), id, TableType.LifePayChannles);


        #endregion


    }




@@ -1763,15 +1841,21 @@




    private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)


    {


        /// 正常支付


        //var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);


        if (_initSettingOptions.OpenTheOnePennyTest)


        {


            /// 1分钱支付


            decimal payAmount = 0.01m;




        /// 1分钱支付


        decimal payAmount = 0.01m;


            CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "支付金额错误");




        CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "支付金额错误");




        return (payAmount, amount - payAmount, amount);


            return (payAmount, amount - payAmount, amount);


        }


        else


        {


            /// 正常支付


            var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);


            return (payAmount, amount - payAmount, amount);


        }


    }




    private void SetOrderStatus(LifePayOrder order, string code)


@@ -1969,11 +2053,11 @@


        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();


        var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)


                            .Where(x => x.PayStatus != LifePayStatusEnum.未支付)


                      .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)


                                            .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)


                                            .WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)


@@ -1985,39 +2069,39 @@


                                            .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.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || channles.Contains(x.ChannelId))


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


                            from b in temp.DefaultIfEmpty()


                            select new LifePayOrderListOutput


                            {


                                DiscountAmount = a.DiscountAmount,


                                FinishTime = a.FinishTime,


                                Id = a.Id,


                                LifePayOrderStatus = a.LifePayOrderStatus,


                                LifePayOrderType = a.LifePayOrderType,


                                LifePayType = a.LifePayType,


                                OrderNo = a.OrderNo,


                                PayAmount = a.PayAmount,


                                PhoneNumber = a.PhoneNumber,


                                RechargeAmount = a.RechargeAmount,


                                UserId = a.UserId,


                                OutOrderNo = a.OutOrderNo,


                                PayStatus = a.PayStatus,


                                PayTime = a.PayTime,


                                ACOOLYOrderNo = a.ACOOLYOrderNo,


                                RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),


                                RefundPrice = a.RefundPrice,


                                CreationTime = a.CreationTime,


                                RefundCheckRemark = a.RefundCheckRemark,


                                RefundApplyRemark = a.RefundApplyRemark,


                                RefundTime = a.RefundTime,


                                ChannelName = b.ChannlesName,


                                ActualRechargeAmount = a.ActualRechargeAmount,


                                PlatformDeductionAmount = a.PlatformDeductionAmount,


                                ACOOLYStatus = a.ACOOLYStatus,


                                LifePayRefundStatus = a.LifePayRefundStatus,


                            });


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


                      from b in temp.DefaultIfEmpty()


                      select new LifePayOrderListOutput


                      {


                          DiscountAmount = a.DiscountAmount ?? 0,


                          FinishTime = a.FinishTime,


                          Id = a.Id,


                          LifePayOrderStatus = a.LifePayOrderStatus ?? 0,


                          LifePayOrderType = a.LifePayOrderType,


                          LifePayType = a.LifePayType,


                          OrderNo = a.OrderNo,


                          PayAmount = a.PayAmount ?? 0,


                          PhoneNumber = a.PhoneNumber,


                          RechargeAmount = a.RechargeAmount ?? 0,


                          UserId = a.UserId,


                          OutOrderNo = a.OutOrderNo,


                          PayStatus = a.PayStatus ?? 0,


                          PayTime = a.PayTime,


                          ACOOLYOrderNo = a.ACOOLYOrderNo,


                          RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),


                          RefundPrice = a.RefundPrice,


                          CreationTime = a.CreationTime,


                          RefundCheckRemark = a.RefundCheckRemark,


                          RefundApplyRemark = a.RefundApplyRemark,


                          RefundTime = a.RefundTime,


                          ChannelName = b.ChannlesName,


                          ActualRechargeAmount = a.ActualRechargeAmount,


                          PlatformDeductionAmount = a.PlatformDeductionAmount,


                          ACOOLYStatus = a.ACOOLYStatus,


                          LifePayRefundStatus = a.LifePayRefundStatus,


                      });




        




        return result;


    }




@@ -2036,39 +2120,40 @@


                                         .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))


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


                            from b in temp.DefaultIfEmpty()


                            select new LifePayOrderListOutput


                            {


                                DiscountAmount = a.DiscountAmount,


                                FinishTime = a.FinishTime,


                                Id = a.Id,


                                LifePayOrderStatus = a.LifePayOrderStatus,


                                LifePayOrderType = a.LifePayOrderType,


                                LifePayType = a.LifePayType,


                                OrderNo = a.OrderNo,


                                PayAmount = a.PayAmount,


                                PhoneNumber = a.PhoneNumber,


                                RechargeAmount = a.RechargeAmount,


                                UserId = a.UserId,


                                OutOrderNo = a.OutOrderNo,


                                PayStatus = a.PayStatus,


                                PayTime = a.PayTime,


                                ACOOLYOrderNo = a.ACOOLYOrderNo,


                                RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),


                                CreationTime = a.CreationTime,


                                RefundCheckRemark = a.RefundCheckRemark,


                                RefundApplyRemark = a.RefundApplyRemark,


                                RefundApplyTime = a.RefundApplyTime,


                                RefundTime = a.RefundTime,


                                RefundPrice = a.RefundPrice,


                                ChannelName = b.ChannlesName,


                                ActualRechargeAmount = a.ActualRechargeAmount,


                                PlatformDeductionAmount = a.PlatformDeductionAmount,


                                ACOOLYStatus = a.ACOOLYStatus,


                                LifePayRefundStatus = a.LifePayRefundStatus,


                                ActualReceivedAmount = a.ActualReceivedAmount.HasValue? a.ActualReceivedAmount.Value : 0


                            });


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


                      from b in temp.DefaultIfEmpty()


                      select new LifePayOrderListOutput


                      {


                          DiscountAmount = a.DiscountAmount ?? 0,


                          FinishTime = a.FinishTime,


                          Id = a.Id,


                          LifePayOrderStatus = a.LifePayOrderStatus ?? 0,


                          LifePayOrderType = a.LifePayOrderType,


                          LifePayType = a.LifePayType,


                          OrderNo = a.OrderNo,


                          PayAmount = a.PayAmount ?? 0,


                          PhoneNumber = a.PhoneNumber,


                          RechargeAmount = a.RechargeAmount ?? 0,


                          UserId = a.UserId,


                          OutOrderNo = a.OutOrderNo,


                          PayStatus = a.PayStatus ?? 0,


                          PayTime = a.PayTime,


                          ACOOLYOrderNo = a.ACOOLYOrderNo,


                          RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),


                          CreationTime = a.CreationTime,


                          RefundCheckRemark = a.RefundCheckRemark,


                          RefundApplyRemark = a.RefundApplyRemark,


                          RefundApplyTime = a.RefundApplyTime,


                          RefundTime = a.RefundTime,


                          RefundOrderNo = a.RefundOrderNo,


                          RefundPrice = a.RefundPrice,


                          ChannelName = b.ChannlesName,


                          ActualRechargeAmount = a.ActualRechargeAmount,


                          PlatformDeductionAmount = a.PlatformDeductionAmount,


                          ACOOLYStatus = a.ACOOLYStatus,


                          LifePayRefundStatus = a.LifePayRefundStatus,


                          ActualReceivedAmount = a.ActualReceivedAmount.HasValue ? a.ActualReceivedAmount.Value : 0


                      });


        return result;


    }


    private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()


@@ -2087,8 +2172,8 @@


                    });


    }




    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal? platformRate,decimal? channleRate,


        decimal? channlesRakeRate,decimal? premiumRate)


    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate,


        decimal channlesRakeRate, decimal premiumRate)


    {


        /// 毛利


        var grossProfit = price * (channleRate - platformRate) / 100;


@@ -2097,26 +2182,26 @@


        var platformPrice = price * platformRate / 100;




        /// 手续费


        var premiumPrice = priceAmount * premiumRate / 100;


        var premiumPrice = priceAmount * (premiumRate) / 100;




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


        var channlesRakePrice = grossProfit * channlesRakeRate / 100;


        var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;




        /// 利润


        var profit = grossProfit - channlesRakePrice - premiumPrice;


        var profit = grossProfit - channlesRakePrice - (premiumRate);




        return new OrderPriceReturn()


        {


            PlatformPrice = platformPrice.HasValue? platformPrice.Value :0,


            PremiumPrice = premiumPrice.HasValue ? premiumPrice.Value : 0,


            ChannlesRakePrice = channlesRakePrice.HasValue? channlesRakePrice.Value:0,


            Profit = profit.HasValue ? profit.Value : 0


            PlatformPrice = platformPrice,


            PremiumPrice = premiumPrice,


            ChannlesRakePrice = channlesRakePrice,


            Profit = profit


        };


    }




    public async Task<decimal> GetLifePayRate(string channelId, LifePayRateTypeEnum lifePayRateType)


    public async Task<decimal> GetLifePayRate(CreateEditPayChannelsInput channel, LifePayRateTypeEnum lifePayRateType)


    {


        if (string.IsNullOrEmpty(channelId))


        if (channel == null)


        {


            var rate = await GetRate();


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


@@ -2125,12 +2210,46 @@


        }


        else


        {


            var channel = await _lifePayChannlesRep.Where(x => x.ChannlesNum == channelId).FirstOrDefaultAsync();




            CheckExtensions.IfTrueThrowUserFriendlyException(channel == null, "未找到对应渠道");


            return channel.ChannlesRate;


        }


    }




    public async Task<SetPayTypeReturn> SetPayType(string orderNo, LifePayTypeEnum lifePayType, string ip)


    {


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


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




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




        order.LifePayType = lifePayType;


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


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


        await _lifePayOrderRepository.UpdateAsync(order);




        var desc = "生活缴费-";


        switch (order.LifePayOrderType)


        {


            case LifePayOrderTypeEnum.PhoneOrder:


                desc += "话费";


                break;


            case LifePayOrderTypeEnum.ElectricOrder:


                desc += "电费";


                break;


            case LifePayOrderTypeEnum.GasOrder:


                desc += "燃气";


                break;


            default:


                break;


        }


        


        return new SetPayTypeReturn()


        {


            Desc = desc,


            OrderNo = order.OrderNo,


            PayAmount = order.PayAmount.HasValue? order.PayAmount.Value : 0,


            LifePayType = lifePayType,


        };


    }




    #endregion


}