fix: 调整ChannelOutput

zhengyiming

2025-03-31 5bc4a0340f55124ebe5b87e393f42d8e96d837b6

 LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs

@@ -21,6 +21,7 @@
    {
        private readonly IRepository<LifePayRechargeReceipts, Guid> _lifePayRechargeReceiptsRepository;
        private readonly IRepository<LifePayExpensesReceipts, Guid> _lifePayExpensesReceiptsRepository;
        private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
        private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
        private readonly IAliPayApi _aliPayApi;
        private readonly IWxPayApi _wxPayApi;
@@ -28,17 +29,20 @@
        public LifePayOrderService(
                              IRepository<LifePayRechargeReceipts, Guid> lifePayRechargeReceiptsRepository,
                              IRepository<LifePayExpensesReceipts, Guid> lifePayExpensesReceiptsRepository,
                              IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
                              IRepository<LifePayOrder, Guid> lifePayOrderRepository,
                              IAliPayApi aliPayApi,
                              IWxPayApi wxPayApi)
        {
            _lifePayRechargeReceiptsRepository = lifePayRechargeReceiptsRepository;
            _lifePayExpensesReceiptsRepository = lifePayExpensesReceiptsRepository;
            _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
            _lifePayOrderRepository = lifePayOrderRepository;
            _aliPayApi = aliPayApi;
            _wxPayApi = wxPayApi;
        }

        #region 查询
        /// <summary>
        /// 获取充值流水
        /// </summary>
@@ -66,42 +70,6 @@
            objectData.TotalRechargeAmount = total;
            list.ObjectData = objectData;
            return list;
        }



        /// <summary>
        /// 编辑充值流水
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input)
        {
            CheckExtensions.IfTrueThrowUserFriendlyException(input.OrderNo == null, "请输入业务订单号");
            CheckExtensions.IfTrueThrowUserFriendlyException(input.RechargeAmount <= 0, "充值金额应大于0");
            CheckExtensions.IfTrueThrowUserFriendlyException(input.Voucher == null, "请提交充值凭证");
            var repeat = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false && x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(repeat != null && repeat.Id != input.Id, "业务订单号重复");
            if (input.Id.HasValue)
            {
                var payRechargeReceipts = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false && x.Id == input.Id.Value).FirstOrDefaultAsync();
                payRechargeReceipts.OrderNo = input.OrderNo;
                payRechargeReceipts.RechargeAmount = input.RechargeAmount;
                payRechargeReceipts.Remark = input.Remark;
                payRechargeReceipts.Voucher = input.Voucher;
            }
            else
            {
                LifePayRechargeReceipts payRechargeReceipts = new LifePayRechargeReceipts()
                {
                    Id = Guid.NewGuid(),
                    OrderNo = input.OrderNo,
                    RechargeAmount = input.RechargeAmount,
                    Remark = input.Remark,
                    Voucher = input.Voucher,
                };
                await _lifePayRechargeReceiptsRepository.InsertAsync(payRechargeReceipts);
            }
        }

        /// <summary>
@@ -141,6 +109,127 @@
            return list;
        }

        /// <summary>
        /// 获取渠道分佣
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<PageOutput<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakePage(LifePayChannlesRakePageInput input)
        {
            var list = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
                .WhereIf(input.ChannelId.IsNotNullOrEmpty(), x => x.ChannelId == input.ChannelId)
                .WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
                .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
                .WhereIf(input.FinishTimeBegin.HasValue, x => x.FinishTime >= input.FinishTimeBegin)
                .WhereIf(input.FinishTimeEnd.HasValue, x => x.FinishTime <= input.FinishTimeEnd)

                .Select(x => new LifePayChannlesRakeListOutput()
                {
                    Id = x.Id,
                    OrderNo = x.OrderNo,
                    PayAmount = x.PayAmount,
                    ChannlesRakeRate = x.ChannlesRakeRate,
                    ChannlesRakePrice = x.ChannlesRakePrice,
                    ChannelId = x.ChannelId,
                    FinishTime = x.FinishTime,
                    CreationTime = x.CreationTime,
                })
                .GetPageResult(input.PageModel);

            var totalRakePrice = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.ChannlesRakePrice);

            LifePayLifePayChannlesRakeStatistics objectData = new LifePayLifePayChannlesRakeStatistics();
            objectData.TotalRakePrice = totalRakePrice;
            list.ObjectData = objectData;
            return list;
        }

        public async Task<List<LifePayChannlesRakeListTemplate>> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input)
        {
            //var result = await (await GetLifePayOrderListFilter(input)).Select(x => new LifePayOrderListTemplate
            //{
            //    DiscountAmount = x.DiscountAmount,
            //    FinishTime = x.FinishTime,
            //    LifePayOrderStatus = x.LifePayOrderStatus,
            //    LifePayOrderType = x.LifePayOrderType,
            //    LifePayType = x.LifePayType,
            //    OrderNo = x.OrderNo,
            //    PayAmount = x.PayAmount,
            //    ActualRechargeAmount = x.RechargeAmount,
            //    PhoneNumber = x.PhoneNumber,
            //    RechargeAmount = x.RechargeAmount,
            //    OutOrderNo = x.OutOrderNo,
            //    PayStatus = x.PayStatus,
            //    PayTime = x.PayTime,
            //    ACOOLYOrderNo = x.ACOOLYOrderNo,
            //    CreationTime = x.CreationTime,
            //    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.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.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.yyyyMMddHHmmss);
            //});
            return null;
        }

        #endregion





        /// <summary>
        /// 编辑充值流水
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input)
        {
            CheckExtensions.IfTrueThrowUserFriendlyException(input.OrderNo == null, "请输入业务订单号");
            CheckExtensions.IfTrueThrowUserFriendlyException(input.RechargeAmount <= 0, "充值金额应大于0");
            CheckExtensions.IfTrueThrowUserFriendlyException(input.Voucher == null, "请提交充值凭证");
            var repeat = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false && x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(repeat != null && repeat.Id != input.Id, "业务订单号重复");
            if (input.Id.HasValue)
            {
                var payRechargeReceipts = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false && x.Id == input.Id.Value).FirstOrDefaultAsync();
                payRechargeReceipts.OrderNo = input.OrderNo;
                payRechargeReceipts.RechargeAmount = input.RechargeAmount;
                payRechargeReceipts.Remark = input.Remark;
                payRechargeReceipts.Voucher = input.Voucher;
            }
            else
            {
                LifePayRechargeReceipts payRechargeReceipts = new LifePayRechargeReceipts()
                {
                    Id = Guid.NewGuid(),
                    OrderNo = input.OrderNo,
                    RechargeAmount = input.RechargeAmount,
                    Remark = input.Remark,
                    Voucher = input.Voucher,
                };
                await _lifePayRechargeReceiptsRepository.InsertAsync(payRechargeReceipts);
            }
        }

        
        /// <summary>
        /// 插入收支流水
        /// </summary>
@@ -256,10 +345,37 @@
                        await AddLifePayExpensesReceipts(input);
                    }
                    
                   
                }
            }
           
        }

        public async Task GetAllChannlesRake()
        {
            var orderlist = await _lifePayOrderRepository.Where(x => x.IsDeleted == false && x.PayStatus == LifePayStatusEnum.已支付 && x.LifePayOrderStatus == LifePayOrderStatusEnum.已完成).ToListAsync();
            foreach (var item in orderlist)
            {
                /// 毛利
                var grossProfit = item.RechargeAmount * (item.ChannleRate - item.PlatformRate) / 100;
                /// 渠道佣金  （(充值面额 * 渠道折扣比例)-(充值面额 * 平台折扣比例)）* 佣金比例
                var channlesRakePrice = grossProfit * (item.ChannlesRakeRate) / 100;
                if (channlesRakePrice.HasValue)
                {
                    LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
                    {
                        OrderNo = item.OrderNo,
                        PayAmount = item.PayAmount.Value,
                        ChannlesRakeRate = item.ChannlesRakeRate.Value,
                        ChannlesRakePrice = channlesRakePrice.Value,
                        FinishTime = item.FinishTime.Value,
                        ChannelId = item.ChannelId,
                    };
                    var repeat = _lifePayChannlesRakeRepository.Where(x => x.OrderNo == item.OrderNo).FirstOrDefaultAsync();
                    if (repeat != null)
                    {
                        await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
                    }
                }
            }
        }
    }
}