暂存

zhengyuxuan

2025-04-03 d47921dc014dfaee234ce50cb4c296d342e09085

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -23,6 +23,14 @@
using static LifePayment.Domain.Shared.LifePaymentConstant;
using ZeroD.Util.Fadd;
using Nest;
using Volo.Abp.Domain.Entities;
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;
using Alipay.AopSdk.Core.Domain;

namespace LifePayment.Application;

@@ -36,13 +44,19 @@
    private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
    private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
    private readonly IRepository<LifePayIntroInfo, Guid> _lifePayIntroInfoRepository;
    private readonly IRepository<DallyStatistics, Guid> _dallyStatisticsRepository;
    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;

@@ -54,9 +68,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,
@@ -67,19 +86,25 @@
        _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;
        this.dataFilter = dataFilter;
        _channelFilter = channelFilter;
        _operateHistory = operateHistory;
    }

    #region 查询


    /// <summary>
    /// 获取电费面值
@@ -135,8 +160,18 @@
    /// <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();
    }

    /// <summary>
    /// 获取渠道折扣
    /// </summary>
    /// <returns></returns>
    public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
    {
        return _lifePayChannlesRep.Where(x => x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
                                           .FirstOrDefault();
    }

    /// <summary>
@@ -145,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();
    }

@@ -155,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();
    }
@@ -167,10 +202,12 @@
    /// <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)
            .WhereIf(input.LoginTimeBegin.HasValue, x => x.LastLoginTime >= input.LoginTimeBegin)
            .WhereIf(input.LoginTimeEnd.HasValue, x => x.LastLoginTime <= input.LoginTimeEnd)
                                            .Select(x =>
                                                   new UserListOutput()
                                                   {
@@ -222,7 +259,9 @@
    /// <returns></returns>
    public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
    {
        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)
@@ -230,35 +269,37 @@
                                            .WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
                                            .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
                                            .WhereIf(input.PayStatus.HasValue, x => x.PayStatus == input.PayStatus.Value)
                                            .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.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,
                                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(),
                                RefundPrice = a.RefundPrice,
                                CreationTime = a.CreationTime,
                                RefundCheckRemark = a.RefundCheckRemark,
                                RefundApplyRemark = a.RefundApplyRemark,
                                RefundTime = a.RefundTime,
                                ChannelName = b.ChannlesName,
                                ActualRechargeAmount = a.ActualRechargeAmount,
                                ActualRechargeAmount = a.RechargeAmount,
                                PlatformDeductionAmount = a.PlatformDeductionAmount,
                                ACOOLYStatus = a.ACOOLYStatus,
                                LifePayRefundStatus = a.LifePayRefundStatus,
@@ -267,32 +308,133 @@
        return result;
    }

    /// <summary>
    /// 退款订单分页
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
    {

        var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
        .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.待退款 || x.LifePayOrderStatus == LifePayOrderStatusEnum.已退款 || x.LifePayOrderStatus == LifePayOrderStatusEnum.退款中
        || (x.LifePayRefundStatus > LifePayRefundStatusEnum.无需退款 && x.LifePayRefundStatus != LifePayRefundStatusEnum.退款驳回))
                                            .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime)
                                            .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime)
                                            .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
                                            .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
                                            .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
                                            .WhereIf(input.LifePayRefundStatus.HasValue, x => x.LifePayRefundStatus == input.LifePayRefundStatus.Value)
                                            .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.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
                            {
                                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,
                                RefundOrderNo = a.RefundOrderNo,
                                RefundTime = a.RefundTime,
                                RefundPrice = a.RefundPrice,
                                ChannelName = b.ChannlesName,
                                ActualRechargeAmount = a.RechargeAmount,
                                PlatformDeductionAmount = a.PlatformDeductionAmount,
                                ACOOLYStatus = a.ACOOLYStatus,
                                LifePayRefundStatus = a.LifePayRefundStatus,
                            }).GetPageResult(input.PageModel);

        return result;
    }

    /// <summary>
    /// 退款订单分页
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public async Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)
    {
        var result = await (await GetLifePayRefundOrderListFilter(input)).Select(x => new LifePayRefundOrderListTemplate
        {
            FinishTime = x.RefundTime,
            RefundPrice = x.RefundPrice,
            LifePayOrderType = x.LifePayOrderType,
            LifePayType = x.LifePayType,
            PayAmount = x.PayAmount,
            PhoneNumber = x.PhoneNumber,
            RefundOrderNo = x.RefundOrderNo,
            RefundApplyTime = x.RefundApplyTime,
            ChannelName = x.ChannelName,
            CreationTime = x.CreationTime,
            ACOOLYStatus = x.ACOOLYStatus,
            RefundApplyRemark = x.RefundApplyRemark,
            RechargeAmount = x.RechargeAmount,
            ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"),
            LifePayRefundStatus = x.LifePayRefundStatus,

        }).OrderByDescending(r => r.CreationTime).ToListAsync();
        var i = 0;
        result.ForEach(s =>
        {
            s.SerialNumber = ++i;
            s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
            s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
            s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
            s.ActualReceivedAmount = s.ActualReceivedAmount;
            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;
    }


    public async Task<LifePayOrderOutput> GetLifePayOrderDetail(string orderNo)
    {
        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();
        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;
        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,
            LifePayOrderStatus = 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(),
@@ -302,16 +444,19 @@
            RefundTime = order.RefundTime,
            ACOOLYOrderNo = order.ACOOLYOrderNo,
            LifePayRefundStatus = order.LifePayRefundStatus,
            ActualRechargeAmount = order.ActualRechargeAmount,
            ActualRechargeAmount = order.RechargeAmount,
            RefundPrice = order.RefundPrice,
            PlatformRate = platformRate.Rate,
            PlatformRate = order.PlatformRate,
            PlatformPrice = order.PlatformDeductionAmount,
            ChannleRate = channle.ChannlesRate,
            ChannlesRakeRate = channle.ChannlesRakeRate,
            ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
            PremiumRate = premium == null ? 0 : premium.Rate,
            PremiumPrice = premium == null ? 0 : Math.Round(order.PayAmount * premium.Rate, 2),
            Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - (premium == null ? 0 : Math.Round(order.PayAmount * premium.Rate, 2))
            ElecBillUrl = order.ElecBillUrl.GetOssPath(),
            RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
            ChannleRate = order.ChannleRate,
            ChannlesRakeRate = order.ChannlesRakeRate,
            ChannlesRakePrice = orderpirce.ChannlesRakePrice,
            PremiumRate = order.PremiumRate,
            PremiumPrice = orderpirce.PremiumPrice,
            Profit = orderpirce.Profit,
            RefundOrderNo = order.RefundOrderNo,
        };

        return result;
@@ -322,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);

@@ -331,28 +476,33 @@
        {
            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,
            LifePayOrderStatus = 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,
            RefundCheckRemark = order.RefundCheckRemark,
            RefundApplyRemark = order.RefundApplyRemark,
            RefundApplyTime = order.RefundApplyTime,
            RefundTime = order.RefundTime,
            RefundOrderNo = order.RefundOrderNo,
            ACOOLYOrderNo = order.ACOOLYOrderNo,
            LifePayRefundStatus = order.LifePayRefundStatus,
            ActualRechargeAmount = order.ActualRechargeAmount,
            ActualReceivedAmount = order.ActualReceivedAmount,
            RefundPrice = order.RefundPrice,
            ElecBillUrl = order.ElecBillUrl.GetOssPath(),
            RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
        };

        return result;
@@ -382,24 +532,27 @@
                                            .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(),
                                                        CreationTime = x.CreationTime,
                                                        RefundCheckRemark = x.RefundCheckRemark,
                                                        RefundApplyRemark = x.RefundApplyRemark,
                                                        RefundApplyTime = x.RefundApplyTime,
                                                        RefundTime = x.RefundTime,
                                                        ACOOLYOrderNo = x.ACOOLYOrderNo,
                                                        LifePayRefundStatus = x.LifePayRefundStatus,
                                                        ACOOLYStatus = x.ACOOLYStatus,
                                                    })
                                            .GetPageResult(input.PageModel);
    }
@@ -410,16 +563,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(),
@@ -445,7 +598,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();
    }

@@ -454,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)
@@ -501,7 +654,7 @@
                                                        OrderNo = x.OrderNo,
                                                        RefundCheckRemark = x.RefundCheckRemark,
                                                        RefundApplyRemark = x.RefundApplyRemark,
                                                        LifePayOrderStatus = x.LifePayOrderStatus,
                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
                                                    }).FirstOrDefaultAsync();

        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "未找到订单信息");
@@ -516,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 =>
@@ -543,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 =>
@@ -595,6 +748,7 @@
            LifePayType = x.LifePayType,
            OrderNo = x.OrderNo,
            PayAmount = x.PayAmount,
            ActualRechargeAmount = x.RechargeAmount,
            PhoneNumber = x.PhoneNumber,
            RechargeAmount = x.RechargeAmount,
            OutOrderNo = x.OutOrderNo,
@@ -602,25 +756,158 @@
            PayTime = x.PayTime,
            ACOOLYOrderNo = x.ACOOLYOrderNo,
            CreationTime = x.CreationTime,
            RefundApplyRemark = x.RefundApplyRemark,
            ChannelName = x.ChannelName
            LifePayRefundStatus = x.LifePayRefundStatus,
            ACOOLYStatus = x.ACOOLYStatus,
            //RefundApplyRemark = x.RefundApplyRemark,
            ChannelName = x.ChannelName,
            PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
        }).OrderByDescending(r => r.CreationTime).ToListAsync();
        var i = 0;
        result.ForEach(s =>
        {
            s.SerialNumber = ++i;
            s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
            s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
            s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
            s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
            s.PayAmountStr = s.PayAmount.ToString("F2");
            s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
            s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
            s.LifePayTypeStr = s.LifePayType.GetDescription();
            s.PayStatusStr = s.PayStatus.GetDescription();
            s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.无需退款 ? "" : s.LifePayRefundStatus.GetDescription();
            s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
            s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
        });
        return result;
    }
    public async Task<string> GetBillErceiptExport(string orderNo)
    {
        try
        {
            var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();

            CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "未找到订单信息");
            if (order.LifePayType == LifePayTypeEnum.AliPay)
            {
                var elecInfoInput = new DataBillErceiptApplyInput
                {
                    Type = "FUND_DETAIL",
                    Key = order.OutOrderNo
                };

                var elecInfoOutput = await _alipayInterfaceManager.DataBillErceiptApply(elecInfoInput);
                if (elecInfoOutput != null)
                {
                    var elecFileInput = new DataBillEreceiptQueryInput
                    {
                        FileId = elecInfoOutput.FileId,
                    };
                    var elecFileOutput = await _alipayInterfaceManager.DataBillEreceiptQuery(elecFileInput);
                    if (!string.IsNullOrEmpty(elecFileOutput.DownloadUrl))
                    {
                        return elecFileOutput.DownloadUrl;
                    }
                    return "";
                }
                return "";
            }
            else
            {
                WxPayTradeBillApplyRequest req = new WxPayTradeBillApplyRequest
                {
                    OutBillNo = order.OutOrderNo,
                };

                var res = await _wxPayApi.WxPayTradeBillApply(req);
                return "";
            }
        }
        catch (Exception ex)
        {
            _logger.LogError("获取订单号为{0}电子回单出现错误：{1}", orderNo, ex.Message);
            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 || 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;
    }

    /// <summary>
    /// 查询微信退款订单信息
    /// </summary>
    /// <param name="outTradeNo"></param>
    /// <returns></returns>
    public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string 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>
    /// 查询微信订单信息
    /// </summary>
    /// <param name="outTradeNo"></param>
    /// <returns></returns>
    public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
    {
        return await _wxPayApi.WxPayTradeQuery(outTradeNo);
    }

  

    #endregion

@@ -642,16 +929,27 @@
        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 amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.默认话费折扣).Rate);
        //var rate = await GetRate();
        //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");

        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.话费订单,
            LifePayOrderStatus = LifePayOrderStatusEnum.充值中,
            LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,
            //LifePayType = input.LifePayType,
            OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
            UserId = user.Id,
@@ -660,7 +958,12 @@
            PayAmount = amount.PayAmont,
            DiscountAmount = amount.DiscountAmount,
            RechargeAmount = amount.RechargeAmount,
            ChannelId = channle.ChannlesNum
            ChannelId = channle.ChannlesNum,
            PlatformRate = platformRate.Rate,
            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
            ChannleRate = rate,
            ChannlesRakeRate = channle.ChannlesRakeRate,
            //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
        };

        await CreateLifePayOrder(orderInput);
@@ -686,16 +989,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.电费订单,
            LifePayOrderStatus = LifePayOrderStatusEnum.充值中,
            LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,
            // LifePayType = input.LifePayType,
            OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
            UserId = user.Id,
@@ -704,7 +1014,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);
@@ -730,16 +1043,25 @@
        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.供应商折扣价);

        var orderInput = new CreateLifePayOrderInput
        {
            OrderNo = channle.ChannlesNum + CreateOrderNo(),
            LifePayOrderStatus = LifePayOrderStatusEnum.待确认,
            LifePayOrderType = LifePayOrderTypeEnum.燃气订单,
            LifePayOrderStatus = LifePayOrderStatusEnum.充值中,
            LifePayOrderType = LifePayOrderTypeEnum.GasOrder,
            // LifePayType = input.LifePayType,
            OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
            UserId = user.Id,
@@ -748,7 +1070,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);
@@ -767,81 +1092,48 @@
    /// <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;

        await _lifePayOrderRepository.UpdateAsync(order);

        var desc = "生活缴费-";
        switch (order.LifePayOrderType)
        {
            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.LifePayType = input.LifePayType;
        order.ActualReceivedAmount = input.ActualReceivedAmount;
        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>
@@ -851,8 +1143,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);
    }
@@ -880,7 +1170,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);
    }
@@ -904,14 +1194,10 @@
            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),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.ElectricChargeOrder.BusiOrderNo);
    }
@@ -939,7 +1225,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);
    }
@@ -971,10 +1257,12 @@
                OpenId = openid
            }
        };
        Logger.LogError("调用请求：" + req.ToJson());
        var timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
        string nonce = Guid.NewGuid().ToString();

        var res = await _wxPayApi.PayTransactionsJsAPI(req);
        Logger.LogError("调用结果：" + res.ToJson());
        string package = "prepay_id=" + res.PrepayId;
        ModelPaymentMiniPay info = new ModelPaymentMiniPay();
        if (res != null)
@@ -1026,38 +1314,68 @@
        order.PayStatus = LifePayStatusEnum.已支付;
        order.PayTime = DateTime.Now;
        order.OutOrderNo = outOrderNo;

        try
        {
            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:
                    break;
            }

            order.LifePayOrderStatus = LifePayOrderStatusEnum.待确认;
            order.LifePayRefundStatus = LifePayRefundStatusEnum.无需退款;
            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;
            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.PayStatus = LifePayStatusEnum.待退款;
            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 LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
    {
        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");
        order.LifePayRefundStatus = refundStatus;
        switch (refundStatus)
        {
            case LifePayRefundStatusEnum.已退款:
                order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
                order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;
                break;
            case LifePayRefundStatusEnum.退款中:
                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;
                order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;
                break;
            default: break;
        }
    }


    /// <summary>
    /// ACOOLYO订单通知处理
@@ -1065,36 +1383,62 @@
    /// <param name="orderNo"></param>
    /// <param name="outOrderNo"></param>
    /// <returns></returns>
    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount)
    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.已完成)
        if (order.LifePayOrderStatus >= LifePayOrderStatusEnum.已完成)
        {
            return;
        }

        order.LifePayOrderStatus = status;
        order.ACOOLYStatus = acoolyStatus;
        order.PlatformDeductionAmount = payAmount;
        if (acoolyOrderNo.IsNotNullOrEmpty())
        {
            order.ACOOLYOrderNo = acoolyOrderNo;
        }

        if (status == LifePayOrderStatusEnum.待退款)
        {
            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
        }

        if (refundApplyRemark.IsNotNullOrEmpty())
        {
            order.RefundApplyRemark = refundApplyRemark;
        }

        order.LifePayOrderStatus = status;
        order.ACOOLYStatus = acoolyStatus;
        order.FinishTime = DateTime.Now;
        await _lifePayOrderRepository.UpdateAsync(order);

        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成)
        {
            order.FinishTime = DateTime.Now;
            ///结算渠道佣金
            /// 毛利
            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);
            }
        }

        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已失败 && order.PayStatus != LifePayStatusEnum.已退款)
        {
            order.PayStatus = LifePayStatusEnum.待退款;
        }


        await _lifePayOrderRepository.UpdateAsync(order);
        /// 创建生活缴费消费记录
        await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,
                    order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
    }

    /// <summary>
@@ -1108,47 +1452,64 @@
        var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id);
        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");

        if (order.PayStatus == LifePayStatusEnum.已退款)
        if (order.LifePayRefundStatus == LifePayRefundStatusEnum.已退款)
        {
            return;
        }

        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.已失败 && order.PayStatus != LifePayStatusEnum.待退款 && order.LifePayOrderStatus != LifePayOrderStatusEnum.退款待审核)
        if (input.RefundPrice > order.PayAmount)
        {
            throw new UserFriendlyException("退款的金额不能大于实付金额");
        }

        if (input.LifePayRefundType == LifePayRefundTypeEnum.全额退款)
        {
            input.RefundPrice = order.PayAmount ?? 0;
        }

        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.待退款 || order.PayStatus != LifePayStatusEnum.已支付 || order.LifePayRefundStatus != LifePayRefundStatusEnum.待退款)
        {
            throw new UserFriendlyException("当前订单状态无法退款");
        }

        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(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
                if (wxRefundResult.Status == "SUCCESS")
                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo, order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
                if (wxRefundResult.Status == WxpayRefundResultStatus.SUCCESS)
                {
                    order.PayStatus = LifePayStatusEnum.已退款;
                    order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
                }
                else if (wxRefundResult.Status == "PROCESSING")
                {
                    order.PayStatus = LifePayStatusEnum.退款中;
                    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
                {
                    throw new UserFriendlyException("退款失败");
                    throw new UserFriendlyException("退款失败:" + wxRefundResult.Message);
                }

                break;
            case LifePayTypeEnum.AliPay:
                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = order.PayAmount.ToString() });
                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });
                if (aliRefundResult.Code != AlipayResultCode.Success)
                {
                    throw new UserFriendlyException("退款失败");
                    throw new UserFriendlyException("退款失败:" + aliRefundResult.SubMsg);
                }

                order.PayStatus = LifePayStatusEnum.已退款;
                order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
                order.RefundOrderNo = outRefundNo;
                order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;
                order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中;
                break;
            default: throw new UserFriendlyException("退款失败");
        }
@@ -1157,13 +1518,13 @@
        order.RefundCheckRemark = input.RefundCheckRemark;
        order.RefundTime = DateTime.Now;
        order.RefundCheckUserId = CurrentUser.Id;
        order.RefundPrice = order.PayAmount;
        order.RefundPrice = input.RefundPrice;

        await _lifePayOrderRepository.UpdateAsync(order);
        //await _lifePayOrderRepository.UpdateAsync(order);

        #region 记录日志

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

        #endregion

@@ -1184,22 +1545,30 @@
            throw new UserFriendlyException("非用户本人退款");
        }

        if (order.PayStatus == LifePayStatusEnum.已退款)
        if (order.LifePayRefundStatus == LifePayRefundStatusEnum.已退款)
        {
            return;
        }

        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.待确认 && order.LifePayOrderStatus != LifePayOrderStatusEnum.已失败
            && order.PayStatus != LifePayStatusEnum.已支付)
        if (order.PayStatus == LifePayStatusEnum.已支付 && order.LifePayOrderStatus != LifePayOrderStatusEnum.已完成
            && order.LifePayOrderStatus != LifePayOrderStatusEnum.待退款 && order.LifePayOrderStatus != LifePayOrderStatusEnum.已退款)
        {
            order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;
            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
            order.RefundApplyRemark = input.RefundApplyRemark;
            order.RefundApplyTime = DateTime.Now;
            await _lifePayOrderRepository.UpdateAsync(order);
        }
        else if (order.LifePayOrderStatus == LifePayOrderStatusEnum.待退款 || order.LifePayRefundStatus == LifePayRefundStatusEnum.待退款 ||
            order.LifePayOrderStatus == LifePayOrderStatusEnum.退款中 || order.LifePayRefundStatus == LifePayRefundStatusEnum.退款中 ||
            order.LifePayOrderStatus == LifePayOrderStatusEnum.已退款 || order.LifePayRefundStatus == LifePayRefundStatusEnum.已退款)
        {
            throw new UserFriendlyException("当前订单无法重复申请退款");
        }
        else
        {
            throw new UserFriendlyException("当前订单状态无法申请退款");
        }

        order.LifePayOrderStatus = LifePayOrderStatusEnum.退款待审核;
        order.RefundApplyRemark = input.RefundApplyRemark;
        order.RefundApplyTime = DateTime.Now;

        await _lifePayOrderRepository.UpdateAsync(order);
    }

    /// <summary>
@@ -1211,13 +1580,13 @@
    /// <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
        {
            OutTradeNo = outTradeNo,
            OutRefundNo = outRefundNo,
            Reason = reason,
            //Reason = reason,
            Amount = new Model_WxPayDomesticRefunds_Amount
            {
                Refund = refund,
@@ -1260,7 +1629,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
@@ -1278,10 +1647,10 @@
            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))
            if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
            {
                user.Name = extraProperties.Name;
            }
@@ -1304,6 +1673,7 @@
        userAccount.DeleterId = userAccount.UserId;
        userAccount.DeletionTime = DateTime.Now;
        userAccount.IsDeleted = true;

        return Constant.SUCCESS;
    }

@@ -1318,24 +1688,26 @@
        var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id);
        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");

        if (order.PayStatus == LifePayStatusEnum.已退款)
        if (order.LifePayRefundStatus == LifePayRefundStatusEnum.已退款)
        {
            return;
        }

        if ((order.LifePayOrderStatus == LifePayOrderStatusEnum.已失败 && order.PayStatus == LifePayStatusEnum.待退款) ||
            order.LifePayOrderStatus == LifePayOrderStatusEnum.退款待审核 || order.LifePayOrderStatus == LifePayOrderStatusEnum.待确认)
        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.待退款 || order.LifePayRefundStatus == LifePayRefundStatusEnum.待退款)
        {
            order.LifePayOrderStatus = LifePayOrderStatusEnum.退款失败;
            if (order.ACOOLYStatus == ACOOLYStatusEnum.已完成 || order.ACOOLYStatus == ACOOLYStatusEnum.充值成功 || order.ACOOLYStatus == ACOOLYStatusEnum.部分充值成功)
            {
                order.LifePayOrderStatus = LifePayOrderStatusEnum.已完成;
            }

            order.RefundCheckRemark = input.RefundCheckRemark;
            order.RefundCheckUserId = CurrentUser.Id;
            order.LifePayRefundStatus = LifePayRefundStatusEnum.退款驳回;

            await _lifePayOrderRepository.UpdateAsync(order);

            #region 记录日志

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

            await LifePayOrderHistory("退款驳回", "退款驳回", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
            #endregion
        }
        else
@@ -1361,7 +1733,7 @@
            dto.Status = input.Status;
            #region 记录日志

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

            #endregion
        }
@@ -1374,7 +1746,7 @@

            #region 记录日志

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

            #endregion
        }
@@ -1391,8 +1763,7 @@

        #region 记录日志

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

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

@@ -1505,15 +1876,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)
@@ -1525,7 +1902,7 @@
                order.FinishTime = DateTime.Now;
                break;
            case ACOOLYConstant.Code.PROCESSING:
                order.LifePayOrderStatus = LifePayOrderStatusEnum.待确认;
                order.LifePayOrderStatus = LifePayOrderStatusEnum.充值中;
                break;
            default:
                break;
@@ -1549,6 +1926,20 @@
        };

        await _distributedEventBus.PublishAsync(recordEto, false);
    }

    private async Task LifePayOrderHistory(string operateContent, string operateName, Guid relationId, int? tableType = (int)OperateHistoryTypeEnum.LifePayRefund)
    {
        var operateHistory = new OperateHistory
        {
            CreatorName = CurrentUser.Name,
            OperateContent = operateName,
            OperateName = operateName,
            RelationId = relationId,
            TableType = tableType

        };
        await _operateHistory.InsertAsync(operateHistory);
    }

    /// <summary>
@@ -1697,48 +2088,109 @@
        return message;
    }


    private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)
    {
        var result = (from a in _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.未支付)
                                            .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
        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)
                                            .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
                                            .WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
                                            .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
                                            .WhereIf(input.PayStatus.HasValue, x => x.PayStatus == input.PayStatus.Value)
                                            .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.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,
                          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(),
                          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;
    }

    private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayRefundOrderListFilter(QueryLifePayRefundOrderListInput input)
    {
        var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
     .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.待退款 || x.LifePayOrderStatus == LifePayOrderStatusEnum.已退款 || x.LifePayOrderStatus == LifePayOrderStatusEnum.退款中
     || (x.LifePayRefundStatus > LifePayRefundStatusEnum.无需退款 && x.LifePayRefundStatus != LifePayRefundStatusEnum.退款驳回))
                                         .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime)
                                         .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime)
                                         .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
                                         .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
                                         .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
                                         .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
                                         .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))
                      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,
                          ChannelName = b.ChannlesName
                          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()
    {
        return _lifePayChannlesRep.Select(x =>
@@ -1755,5 +2207,84 @@
                    });
    }

    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate,
        decimal channlesRakeRate, decimal premiumRate)
    {
        /// 毛利
        var grossProfit = price * (channleRate - platformRate) / 100;

        /// 平台扣款金额  充值面额 * 平台折扣比例
        var platformPrice = price * platformRate / 100;

        /// 手续费
        var premiumPrice = priceAmount * (premiumRate) / 100;

        /// 渠道佣金  （(充值面额 * 渠道折扣比例)-(充值面额 * 平台折扣比例)）* 佣金比例
        var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;

        /// 利润
        var profit = grossProfit - channlesRakePrice - premiumPrice;

        return new OrderPriceReturn()
        {
            PlatformPrice = platformPrice,
            PremiumPrice = premiumPrice,
            ChannlesRakePrice = channlesRakePrice,
            Profit = profit
        };
    }

    public async Task<decimal> GetLifePayRate(CreateEditPayChannelsInput channel, LifePayRateTypeEnum lifePayRateType)
    {
        if (channel == null)
        {
            var rate = await GetRate();
            CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");
            var result = rate.FirstOrDefault(x => x.RateType == lifePayRateType).Rate;
            return result;
        }
        else
        {
            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.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
}