fix:bug修复

zhengyuxuan

2025-04-07 f291f615859f129265f740526cba144415d7b49e

 LifePayment/LifePayment.Application/LifePay/StatisticsService.cs

@@ -144,14 +144,16 @@

            foreach (var item in groupedStatistics)
            {
                /// 实际收款日期
                var creationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd");
                ReceiptsDetail receive = new ReceiptsDetail()
                {
                    CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
                    CreationTime = creationTime,
                    Amount = item.TotalReceiptsYesterday
                };
                ReceiptsDetail income = new ReceiptsDetail()
                {
                    CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
                    CreationTime = creationTime,
                    Amount = item.TotalIncomeYesterday
                };
                receiptsListOutPut.ReceiveList.Add(receive);
@@ -184,12 +186,16 @@

            ChannlesRakeListOutPut channlesRakeListOutPut = new ChannlesRakeListOutPut();

            foreach (var item in groupedStatistics)
            var dateList = Enumerable.Range(1, 31)
                        .Select(i => today.AddDays(-i))
                        .ToList();
            foreach (var date in dateList)
            {
                var stat = groupedStatistics.FirstOrDefault(g => g.FinishTime == date.ToString("yyyy-MM-dd"));
                ReceiptsDetail receive = new ReceiptsDetail()
                {
                    CreationTime = item.FinishTime,
                    Amount = item.ChannlesRakePrice
                    CreationTime = date.ToString("yyyy-MM-dd"),
                    Amount = stat?.ChannlesRakePrice ?? 0
                };
                channlesRakeListOutPut.ChannlesRakeList.Add(receive);
            }
@@ -200,8 +206,9 @@
        public async Task<ChannelDataListOutPut> GetChannelDataList(List<string> channleList)
        {
            int maxStatisticsNumber = 5;
            var statistics = await _lifePayChannlesRakeRepository
                            .WhereIf(channleList != null && channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
            /// 这里不加入.Where()会报错
            var statistics = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
                            .WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
            .ToListAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(statistics == null, "渠道收款统计失败");
            var groupedStatistics = statistics
@@ -232,7 +239,7 @@
            }

            /// 累计用户
            var users = await _lifePayUserRepository.WhereIf(channleList.Count() > 0, x => channleList.Contains(x.CreationChannleNum))
            var users = await _lifePayUserRepository.Where(x => x.IsDeleted == false).WhereIf(channleList.Count() > 0, x => channleList.Contains(x.CreationChannleNum))
                .ToListAsync();
            CheckExtensions.IfTrueThrowUserFriendlyException(statistics == null, "累计用户统计失败");
            var groupedUsers = users