From b6ee499548febb01989eafca1eb5ad25988d6bca Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 02 四月 2025 17:03:48 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index 4b9a3c5..021fbd7 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -19,6 +19,7 @@
using System.Threading.Channels;
using ZeroD.Util;
using NPOI.SS.Formula.Functions;
+using System.Security.Principal;
namespace LifePayment.Application.LifePay
{
@@ -28,19 +29,22 @@
private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
private readonly IRepository<DallyStatistics, Guid> _dallyStatisticsRepository;
private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
+ private readonly IRepository<LifePayRechargeReceipts, Guid> _lifePayRechargeReceiptsRepository;
private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
public StatisticsService(
IRepository<LifePayOrder, Guid> lifePayOrderRepository,
IRepository<LifePayUser, Guid> lifePayUserRepository,
- IRepository<DallyStatistics, Guid> dallyStatisticsRepository,
- IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
- IRepository<LifePayChannles, Guid> lifePayChannlesRep)
+ IRepository<DallyStatistics, Guid> dallyStatisticsRepository,
+ IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
+ IRepository<LifePayRechargeReceipts, Guid> lifePayRechargeReceiptsRepository,
+ IRepository<LifePayChannles, Guid> lifePayChannlesRep)
{
_lifePayOrderRepository = lifePayOrderRepository;
_lifePayUserRepository = lifePayUserRepository;
_dallyStatisticsRepository = dallyStatisticsRepository;
_lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
+ _lifePayRechargeReceiptsRepository = lifePayRechargeReceiptsRepository;
_lifePayChannlesRep = lifePayChannlesRep;
}
@@ -55,6 +59,7 @@
var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.Date == today)
.WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
.ToListAsync();
+ var totalRechargeReceipts = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false && x.CreationTime < today).SumAsync(x => x.RechargeAmount);
if (statistics == null || statistics.Count() == 0)
{
TopStatisticsOutput topStatisticsOutput = new TopStatisticsOutput() { };
@@ -64,7 +69,6 @@
var entity = await TopStatistics(item.ChannlesNum, today);
if (channleList.Count() == 0 || channleList.Contains(item.ChannlesNum))
{
- topStatisticsOutput.Amount += entity.Amount;
topStatisticsOutput.AccumulatedReceipts += entity.AccumulatedReceipts;
topStatisticsOutput.AccumulatedIncome += entity.AccumulatedIncome;
topStatisticsOutput.ReceiptsYesterday += entity.ReceiptsYesterday;
@@ -74,15 +78,26 @@
topStatisticsOutput.YesterdayFail += entity.YesterdayFail;
topStatisticsOutput.AccumulatedUsers += entity.AccumulatedUsers;
topStatisticsOutput.YesterdayActiveUsers += entity.YesterdayActiveUsers;
+ topStatisticsOutput.AccumulatedChannlesRakePrice += entity.AccumulatedChannlesRakePrice;
}
}
+
+ if (channleList.Count() == 0)
+ {
+ /// 璐︽埛浣欓
+ var accountBalance = totalRechargeReceipts - await _lifePayOrderRepository.Where(x => x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ && (x.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || x.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || x.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�))
+ .SumAsync(x => x.PayAmount);
+ topStatisticsOutput.Amount = accountBalance ?? 0;
+
+ }
+
return topStatisticsOutput;
}
else
{
TopStatisticsOutput topStatisticsOutput = new TopStatisticsOutput()
{
- Amount = statistics.Sum(s => s.Amount),
AccumulatedReceipts = statistics.Sum(s => s.AccumulatedReceipts),
AccumulatedIncome = statistics.Sum(s => s.AccumulatedIncome),
ReceiptsYesterday = statistics.Sum(s => s.ReceiptsYesterday),
@@ -92,7 +107,17 @@
YesterdayFail = statistics.Sum(s => s.YesterdayFail),
AccumulatedUsers = statistics.Sum(s => s.AccumulatedUsers),
YesterdayActiveUsers = statistics.Sum(s => s.YesterdayActiveUsers),
+ AccumulatedChannlesRakePrice = statistics.Sum(s => s.AccumulatedChannlesRakePrice)
};
+ if (channleList.Count() == 0)
+ {
+ /// 璐︽埛浣欓
+ var accountBalance = totalRechargeReceipts - await _lifePayOrderRepository.Where(x => x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ && (x.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || x.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || x.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�))
+ .SumAsync(x => x.PayAmount);
+ topStatisticsOutput.Amount = accountBalance ?? 0;
+ }
+
return topStatisticsOutput;
}
}
@@ -125,12 +150,12 @@
{
ReceiptsDetail receive = new ReceiptsDetail()
{
- CreationTime = item.CreationTime.ToString("yyyy-MM-dd"),
+ CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
Amount = item.TotalReceiptsYesterday
};
ReceiptsDetail income = new ReceiptsDetail()
{
- CreationTime = item.CreationTime.ToString("yyyy-MM-dd"),
+ CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
Amount = item.TotalIncomeYesterday
};
receiptsListOutPut.ReceiveList.Add(receive);
@@ -143,18 +168,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 +187,7 @@
{
ReceiptsDetail receive = new ReceiptsDetail()
{
- CreationTime = item.CreationTime.ToString("yyyy-MM-dd"),
+ CreationTime = item.FinishTime,
Amount = item.ChannlesRakePrice
};
@@ -234,9 +259,29 @@
return channelDataList;
-
}
+ public async Task StatisticsByDate(int days)
+ {
+ var today = DateTime.Now.Date;
+ for (var i = 0; i < days; i++)
+ {
+ var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.Date == today)
+ .ToListAsync();
+
+ if (statistics == null || statistics.Count() == 0)
+ {
+ TopStatisticsOutput topStatisticsOutput = new TopStatisticsOutput() { };
+ var allChannle = await _lifePayChannlesRep.Where(x => x.IsDeleted == false).ToListAsync();
+ foreach (var item in allChannle)
+ {
+ var entity = await TopStatistics(item.ChannlesNum, today);
+ }
+ }
+
+ today = today.AddDays(-1);
+ }
+ }
private async Task<DallyStatistics> TopStatistics(string channleId, DateTime today)
{
@@ -270,14 +315,15 @@
/// 绱鐢ㄦ埛
var accumulatedUsers = await _lifePayUserRepository.Where(x => x.IsDeleted == false).WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.CreationChannleNum == channleId).CountAsync();
/// 鏄ㄦ棩娲昏穬鐢ㄦ埛
- var yesterdayActiveUsers = await _lifePayUserRepository.Where(x => x.IsDeleted == false).WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.CreationChannleNum == channleId).Where(x => x.LastLoginTime >= today.AddDays(-1)).CountAsync();
+ var yesterdayActiveUsers = await _lifePayUserRepository.Where(x => x.IsDeleted == false).WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.CreationChannleNum == channleId).Where(x => x.LastLoginTime >= today.AddDays(-1) && x.LastLoginTime < today).CountAsync();
+ var accumulatedChannlesRakePrice = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false && x.FinishTime < today)
+ .WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.ChannelId == channleId).SumAsync(x => x.ChannlesRakePrice);
var entity = new DallyStatistics()
{
Id = GuidGenerator.Create(),
CreationTime = today,
- Amount = 0,
AccumulatedReceipts = accumulatedReceipts ?? 0,
AccumulatedIncome = accumulatedIncome ?? 0,
IncomeYesterday = yesterdayIncome ?? 0,
@@ -289,6 +335,7 @@
AccumulatedUsers = accumulatedUsers,
YesterdayActiveUsers = yesterdayActiveUsers,
ChannelId = channleId,
+ AccumulatedChannlesRakePrice = accumulatedChannlesRakePrice,
Date = today.AddDays(-1)
};
await _dallyStatisticsRepository.InsertAsync(entity);
--
Gitblit v1.9.1