fix:bug修复

zhengyuxuan

2025-04-02 e7d1ef3eef4dcbec4f7fae27542e94cc0bbf89c8

 LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs

@@ -183,7 +183,13 @@
                })
                .GetPageResult(input.PageModel);

            var totalRakePrice = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.ChannlesRakePrice);
            var totalRakePrice = 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)
                .SumAsync(x => x.ChannlesRakePrice);

            LifePayLifePayChannlesRakeStatistics objectData = new LifePayLifePayChannlesRakeStatistics();
            objectData.TotalRakePrice = totalRakePrice;
@@ -332,6 +338,9 @@
            }
        }


        

        /// <summary>
        /// 统计所有消费流水
        /// </summary>
@@ -374,6 +383,10 @@
            }
        }

        /// <summary>
        /// 统计所有收支流水
        /// </summary>
        /// <returns></returns>
        public async Task GetAllLifePayExpensesReceipts()
        {
            var orderlist = await (from a in _lifePayOrderRepository.Where(x => x.PayStatus >= LifePayStatusEnum.已支付)
@@ -419,6 +432,10 @@
            }
        }

        /// <summary>
        /// 获取全部渠道分佣
        /// </summary>
        /// <returns></returns>
        public async Task GetAllChannlesRake()
        {
            var orderlist = await _lifePayOrderRepository.Where(x => x.IsDeleted == false && x.PayStatus == LifePayStatusEnum.已支付 && x.LifePayOrderStatus == LifePayOrderStatusEnum.已完成).ToListAsync();
@@ -427,15 +444,16 @@
                /// 毛利
                var grossProfit = item.RechargeAmount * (item.ChannleRate - item.PlatformRate) / 100;
                /// 渠道佣金  （(充值面额 * 渠道折扣比例)-(充值面额 * 平台折扣比例)）* 佣金比例
                var channlesRakePrice = grossProfit * (item.ChannlesRakeRate) / 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,
                        PayAmount = item.RechargeAmount ?? 0,
                        ChannlesRakeRate = item.ChannlesRakeRate ?? 0,
                        ChannlesRakePrice = channlesRakePrice ?? 0,
                        FinishTime = item.FinishTime.Value,
                        ChannelId = item.ChannelId,
                    };