zhengyuxuan
2025-04-01 926d1ff779b1ee9c524bc05d3f161bee6740b2a8
fix:bug修复
3个文件已修改
46 ■■■■■ 已修改文件
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -336,7 +336,6 @@
        public async Task GetAllLifePayConsumption()
        {
            var orderList = await _lifePayOrderRepository.Where(x => x.PayStatus == LifePayStatusEnum.已支付).ToListAsync();
            foreach (var item in orderList)
            {
                LifePayConsumption lifePayConsumption = new LifePayConsumption()
@@ -344,17 +343,20 @@
                    OrderNo = item.OrderNo,
                    AcoolyOrderNo = item.ACOOLYOrderNo,
                    Amount = item.PlatformDeductionAmount.Value,
                    //ACOOLYStatus =
                };
                //switch (item.ACOOLYStatus)
                //{
                //    case ACOOLYStatusEnum.充值中:
                //        break;
                //    default:break;
                //}
                switch (item.ACOOLYStatus)
                {
                    case ACOOLYStatusEnum.充值中:
                        lifePayConsumption.FinishTime = item.CreationTime;
                        lifePayConsumption.ACOOLYStatus = ACOOLYStatusEnum.充值中;
                        lifePayConsumption.FrozenStatus = ConsumptionFrozenStatusEnum.Frozen;
                        lifePayConsumption.Flow = ConsumptionFlowEnum.Unchanged;
                        lifePayConsumption.DeductionAmount = 0;
                        lifePayConsumption.FrozenAmount = lifePayConsumption.Amount;
                        break;
                    default: break;
                }
            }
        }
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -143,18 +143,18 @@
        public async Task<ChannlesRakeListOutPut> GetChannlesRakeList(List<string> channleList)
        {
            var today = DateTime.Now.Date;
            var statistics = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
            var statistics = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false &&
            x.FinishTime.Date <= today && x.FinishTime.Date >= today.AddDays(-30))
                            .WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
                            .ToListAsync();
            var groupedStatistics = statistics
               .GroupBy(x => x.CreationTime)
               .GroupBy(x => x.FinishTime.ToString("yyyy-MM-dd"))
               .Select(g => new
               {
                   CreationTime = g.Key,
                   FinishTime = g.Key,
                   ChannlesRakePrice = g.Sum(x => x.ChannlesRakePrice),
               })
               .ToList();
            ChannlesRakeListOutPut channlesRakeListOutPut = new ChannlesRakeListOutPut();
@@ -162,7 +162,7 @@
            {
                ReceiptsDetail receive = new ReceiptsDetail()
                {
                    CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
                    CreationTime = item.FinishTime,
                    Amount = item.ChannlesRakePrice
                };
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -77,6 +77,20 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetChannelDataList(LifePayment.Application.Contracts.TopStatisticsInput)">
            <summary>
            渠道数据
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetChannlesRakeList(LifePayment.Application.Contracts.TopStatisticsInput)">
            <summary>
            30日佣金列表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetElectricParValue(LifePayment.Domain.Shared.ChannelsBaseInput)">
            <summary>
            获取电费面值