From 75fa678528c66c37c40684cb753986d2e7d256df Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 02 四月 2025 18:13:38 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 206 insertions(+), 15 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index 0ff2fb3..b6a0443 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -18,6 +18,8 @@
using Microsoft.EntityFrameworkCore;
using System.Threading.Channels;
using ZeroD.Util;
+using NPOI.SS.Formula.Functions;
+using System.Security.Principal;
namespace LifePayment.Application.LifePay
{
@@ -26,17 +28,23 @@
private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
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<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;
}
@@ -51,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() { };
@@ -60,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;
@@ -70,17 +78,24 @@
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.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || x.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || x.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+ .SumAsync(x => x.PlatformDeductionAmount);
+ 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),
@@ -90,16 +105,180 @@
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.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || x.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || x.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+ .SumAsync(x => x.PlatformDeductionAmount);
+ topStatisticsOutput.Amount = accountBalance ?? 0;
+ }
+
return topStatisticsOutput;
}
}
- //public async Task<ReceiptsListOutPut> GetReceiptsList(List<string> channleList)
- //{
- // var today = DateTime.Now.Date;
+ /// <summary>
+ /// 杩�30鏃ユ敹娆炬暟鎹�
+ /// </summary>
+ /// <param name="channleList"></param>
+ /// <returns></returns>
+ public async Task<ReceiptsListOutPut> GetReceiptsList(List<string> channleList)
+ {
+ var today = DateTime.Now.Date;
+ var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.Date <= today && x.CreationTime.Date >= today.AddDays(-30))
+ .WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
+ .OrderBy(o => o.CreationTime)
+ .ToListAsync();
- //}
+ var groupedStatistics = statistics
+ .GroupBy(x => x.CreationTime)
+ .Select(g => new
+ {
+ CreationTime = g.Key,
+ TotalReceiptsYesterday = g.Sum(x => x.ReceiptsYesterday),
+ TotalIncomeYesterday = g.Sum(x => x.IncomeYesterday)
+ })
+ .ToList();
+ ReceiptsListOutPut receiptsListOutPut = new ReceiptsListOutPut();
+
+ foreach (var item in groupedStatistics)
+ {
+ ReceiptsDetail receive = new ReceiptsDetail()
+ {
+ CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
+ Amount = item.TotalReceiptsYesterday
+ };
+ ReceiptsDetail income = new ReceiptsDetail()
+ {
+ CreationTime = item.CreationTime.AddDays(-1).ToString("yyyy-MM-dd"),
+ Amount = item.TotalIncomeYesterday
+ };
+ receiptsListOutPut.ReceiveList.Add(receive);
+ receiptsListOutPut.IncomeList.Add(income);
+ }
+
+ return receiptsListOutPut;
+ }
+
+ public async Task<ChannlesRakeListOutPut> GetChannlesRakeList(List<string> channleList)
+ {
+ var today = DateTime.Now.Date;
+ 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.FinishTime.ToString("yyyy-MM-dd"))
+ .Select(g => new
+ {
+ FinishTime = g.Key,
+ ChannlesRakePrice = g.Sum(x => x.ChannlesRakePrice),
+ })
+ .ToList();
+
+ ChannlesRakeListOutPut channlesRakeListOutPut = new ChannlesRakeListOutPut();
+
+ foreach (var item in groupedStatistics)
+ {
+ ReceiptsDetail receive = new ReceiptsDetail()
+ {
+ CreationTime = item.FinishTime,
+ Amount = item.ChannlesRakePrice
+ };
+
+ channlesRakeListOutPut.ChannlesRakeList.Add(receive);
+ }
+
+ return channlesRakeListOutPut;
+
+ }
+
+ public async Task<ChannelDataListOutPut> GetChannelDataList(List<string> channleList)
+ {
+
+ var statistics = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
+ .WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
+ .ToListAsync();
+ var groupedStatistics = statistics
+ .GroupBy(x => x.ChannelId)
+ .Select(g => new
+ {
+ ChannelId = g.Key,
+ ReceivePrice = g.Sum(x => x.PayAmount),
+ ChannlesRakePrice = g.Sum(x => x.ChannlesRakePrice),
+ })
+ .OrderByDescending(o => o.ReceivePrice)
+ .ToList();
+
+ ChannelDataListOutPut channelDataList = new ChannelDataListOutPut();
+
+ foreach (var item in groupedStatistics)
+ {
+ ChannelDataReceive receive = new ChannelDataReceive()
+ {
+ ChannelName = _lifePayChannlesRep.Where(x => x.ChannlesNum == item.ChannelId).FirstOrDefault().ChannlesName,
+ ReceivePrice = item.ReceivePrice,
+ ChannlesRakePrice = item.ChannlesRakePrice,
+ };
+ if (channelDataList.ReceiveList.Count() < 5)
+ {
+ channelDataList.ReceiveList.Add(receive);
+ }
+ }
+
+ /// 绱鐢ㄦ埛
+ var users = await _lifePayUserRepository.Where(x => x.IsDeleted == false).WhereIf(channleList.Count() > 0, x => channleList.Contains(x.CreationChannleNum))
+ .ToListAsync();
+ var groupedUsers = users
+ .GroupBy(x => x.CreationChannleNum)
+ .Select(g => new
+ {
+ ChannelId = g.Key,
+ Number = g.Count(),
+ })
+ .OrderByDescending(o => o.Number)
+ .ToList();
+ foreach (var item in groupedUsers)
+ {
+ ChannelDataUserNumber usernumber = new ChannelDataUserNumber()
+ {
+ ChannelName = _lifePayChannlesRep.Where(x => x.ChannlesNum == item.ChannelId).FirstOrDefault().ChannlesName,
+ Number = item.Number,
+ };
+ if (channelDataList.UserNumberList.Count() < 5)
+ {
+ channelDataList.UserNumberList.Add(usernumber);
+ }
+ }
+
+
+
+ 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)
{
@@ -116,6 +295,9 @@
/// 绱鏀跺叆锛氱粺璁″钩鍙拌处鎴蜂笅璁㈠崟鐘舵�佷负鈥滃凡瀹屾垚鈥濅笖璁㈠崟鍒涘缓鏃堕棿鍦ㄦ槰澶╁強涔嬪墠鏀跺埌鐨勩�愮敤鎴峰疄浠橀噾棰�-骞冲彴鎵ｆ閲戦-閮ㄥ垎閫�娆鹃噾棰濄�戯紱
var accumulatedIncome = await _lifePayOrderRepository.Where(x => x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
.WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.ChannelId == channleId).SumAsync(x => x.PayAmount - (x.PlatformDeductionAmount ?? 0) - (x.RefundPrice ?? 0));
+ /// 鏄ㄦ棩鏀跺叆锛氱粺璁″钩鍙拌处鎴蜂笅璁㈠崟鐘舵�佷负鈥滃凡瀹屾垚鈥濅笖璁㈠崟鍒涘缓鏃堕棿鍦ㄦ槰澶╂敹鍒扮殑銆愮敤鎴峰疄浠橀噾棰�-骞冲彴鎵ｆ閲戦-閮ㄥ垎閫�娆鹃噾棰濄�戯紱
+ var yesterdayIncome = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+ .WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.ChannelId == channleId).SumAsync(x => x.PayAmount - (x.PlatformDeductionAmount ?? 0) - (x.RefundPrice ?? 0));
/// 绱涓嬪崟锛氱粺璁″钩鍙颁腑璁㈠崟涓嬪崟鏃堕棿鍦ㄦ槰澶╁強涔嬪墠鏃堕棿鐨勮鍗曡褰曪紱
var accumulatedOrders = await _lifePayOrderRepository.Where(x => x.CreationTime < today).WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.ChannelId == channleId).CountAsync();
/// 鏄ㄦ棩涓嬪崟锛氱粺璁″钩鍙颁腑璁㈠崟涓嬪崟鏃堕棿鍦ㄦ槰澶╃殑璁㈠崟璁板綍锛�
@@ -128,18 +310,25 @@
var yesterdayFail = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
.WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.ChannelId == channleId).CountAsync();
/// 绱鐢ㄦ埛
- var accumulatedUsers = await _lifePayUserRepository.WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.CreationChannleNum == channleId).CountAsync();
+ var accumulatedUsers = await _lifePayUserRepository.Where(x => x.IsDeleted == false && x.CreationTime < today)
+ .WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.CreationChannleNum == channleId).CountAsync();
/// 鏄ㄦ棩娲昏穬鐢ㄦ埛
- var yesterdayActiveUsers = await _lifePayUserRepository.WhereIf(!string.IsNullOrWhiteSpace(channleId), x => x.CreationChannleNum == channleId).Where(x => x.LastLoginTime >= today.AddDays(-1)).CountAsync();
-
+ var yesterdayActiveUsers = await (from a in _lifePayUserRepository
+ join b in _lifePayOrderRepository on a.Id equals b.UserId
+ where b.CreationTime >= today.AddDays(-1) && b.CreationTime < today
+ && (b.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�间腑 || b.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || b.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || b.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+ select b).Distinct().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 = DateTime.Now,
- Amount = 0,
+ CreationTime = today,
AccumulatedReceipts = accumulatedReceipts ?? 0,
AccumulatedIncome = accumulatedIncome ?? 0,
+ IncomeYesterday = yesterdayIncome ?? 0,
ReceiptsYesterday = receiptsYesterday ?? 0,
AccumulatedOrders = accumulatedOrders,
OrdersNumYesterday = ordersNumYesterday,
@@ -147,7 +336,9 @@
YesterdayFail = yesterdayFail,
AccumulatedUsers = accumulatedUsers,
YesterdayActiveUsers = yesterdayActiveUsers,
- ChannelId = channleId
+ ChannelId = channleId,
+ AccumulatedChannlesRakePrice = accumulatedChannlesRakePrice,
+ Date = today.AddDays(-1)
};
await _dallyStatisticsRepository.InsertAsync(entity);
return entity;
--
Gitblit v1.9.1