From dbf044662b9a75e5b42f8f76c65faaf89c95bb21 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 02 四月 2025 19:36:48 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs | 4 ++--
LifePayment/LifePayment.Application.Contracts/LifePay/IStatisticsService.cs | 8 ++++----
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 11 +++++++----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/IStatisticsService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/IStatisticsService.cs
index cc5dd39..8d32bc2 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/IStatisticsService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/IStatisticsService.cs
@@ -10,13 +10,13 @@
public interface IStatisticsService : IApplicationService
{
- Task<TopStatisticsOutput> GetTopStatistics(List<string>? channleList = null);
+ Task<TopStatisticsOutput> GetTopStatistics(List<string>? channleList);
Task StatisticsByDate(int days);
- Task<ReceiptsListOutPut> GetReceiptsList(List<string>? channleList = null);
+ Task<ReceiptsListOutPut> GetReceiptsList(List<string>? channleList);
- Task<ChannelDataListOutPut> GetChannelDataList(List<string>? channleList = null);
+ Task<ChannelDataListOutPut> GetChannelDataList(List<string>? channleList);
- Task<ChannlesRakeListOutPut> GetChannlesRakeList(List<string>? channleList = null);
+ Task<ChannlesRakeListOutPut> GetChannlesRakeList(List<string>? channleList);
}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index b6a0443..c526c4b 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -20,6 +20,7 @@
using ZeroD.Util;
using NPOI.SS.Formula.Functions;
using System.Security.Principal;
+using StackExchange.Redis;
namespace LifePayment.Application.LifePay
{
@@ -199,8 +200,10 @@
{
var statistics = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
- .WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
- .ToListAsync();
+ .WhereIf(channleList != null && channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
+ .ToListAsync();
+
+ CheckExtensions.IfTrueThrowUserFriendlyException(statistics == null, "缁熻澶辫触");
var groupedStatistics = statistics
.GroupBy(x => x.ChannelId)
.Select(g => new
@@ -218,7 +221,7 @@
{
ChannelDataReceive receive = new ChannelDataReceive()
{
- ChannelName = _lifePayChannlesRep.Where(x => x.ChannlesNum == item.ChannelId).FirstOrDefault().ChannlesName,
+ ChannelName = _lifePayChannlesRep.Where(x => x.ChannlesNum == item.ChannelId).FirstOrDefault()?.ChannlesName,
ReceivePrice = item.ReceivePrice,
ChannlesRakePrice = item.ChannlesRakePrice,
};
@@ -244,7 +247,7 @@
{
ChannelDataUserNumber usernumber = new ChannelDataUserNumber()
{
- ChannelName = _lifePayChannlesRep.Where(x => x.ChannlesNum == item.ChannelId).FirstOrDefault().ChannlesName,
+ ChannelName = _lifePayChannlesRep.Where(x => x.ChannlesNum == item.ChannelId).FirstOrDefault()?.ChannlesName,
Number = item.Number,
};
if (channelDataList.UserNumberList.Count() < 5)
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs
index 4eb4d14..21ec4ba 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs
@@ -12,7 +12,7 @@
/// <summary>
/// 鍒嗕剑
/// </summary>
- public class LifePayChannlesRake : FullAuditedEntity<Guid>, IDataUserFilter
+ public class LifePayChannlesRake : FullAuditedEntity<Guid>
{
public LifePayChannlesRake()
{
@@ -47,7 +47,7 @@
/// <summary>
/// 鎷撳睍灞炴��
/// </summary>
- public string ExtraProperties { get; set; }
+ public string? ExtraProperties { get; set; }
/// <summary>
/// 涓嬪崟娓犻亾
--
Gitblit v1.9.1