zhengyuxuan
2025-04-02 dbf044662b9a75e5b42f8f76c65faaf89c95bb21
fix:bug修复
3个文件已修改
23 ■■■■■ 已修改文件
LifePayment/LifePayment.Application.Contracts/LifePay/IStatisticsService.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
}
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)
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>
        /// 下单渠道