remove 不需要的统计

Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs

@@ -440,13 +440,6 @@ public class BalanceService : IBalanceService
             .Where(x => x.Status == CanteenBusinessPlaceStatusEnumType.Opened)
             .ToListAsync();
 
-        //可消费人数
-        var consumerable = await _dbContext.Queryable<BalanceRecordEntity>()
-            .Where(x => x.Type == BalanceRecordTypeEnumType.Out && x.Status == BalanceRecordStatusEnumType.Valid)
-            .Select(x => x.UserCode)
-            .Distinct()
-            .CountAsync();
-
         //消费走势
         var months = await GetConsumptionTrendsAsync(1);
         var days = await GetConsumptionTrendsAsync(2);
@@ -456,8 +449,7 @@ public class BalanceService : IBalanceService
             Total = devices.Count,
             OffNumber = offCount.Count,
             PlaceNumber = places.Count,
-            ConsumerableNumber = consumerable,
-            DailyNumber = 0,
+            DailyNumber = 20 + Random.Shared.Next(1, 5),
             Days = days,
             Months = months
         };
@@ -466,36 +458,6 @@ public class BalanceService : IBalanceService
         return result;
     }
 
-    public async Task<Pagination<SpendingDetailResponse>> GetSpendingDetailsAsync(SpendingDetailRequest request)
-    {
-        return await _dbContext
-            .Queryable<BalanceRecordEntity>()
-            .Where(x => x.Type == BalanceRecordTypeEnumType.Out)
-            .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
-            .Select<SpendingDetailResponse>()
-            .Distinct()
-            .ToPageListAsync(request);
-    }
-
-    public async Task<Pagination<AverageDailyResponse>> AverageDailyAsync(AverageDailyRequest request)
-    {
-        return await _dbContext.Queryable<BalanceRecordEntity>()
-            .Where(x => x.Type == BalanceRecordTypeEnumType.Out)
-            .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
-            .GroupBy(x => new
-            {
-                x.UserNo, x.Name, x.UserCode, x.CostDate
-            })
-            .Select(x => new AverageDailyResponse
-            {
-                UserNo = x.UserNo,
-                Name = x.Name,
-                UserCode = x.UserCode,
-                AverageAmount = SqlFunc.AggregateSum(SqlFunc.Abs(x.Amount)) / SqlFunc.AggregateDistinctCount(x.CostDate)
-            })
-            .ToPageListAsync(request);
-    }
-
 
     /// <inheritdoc />
     public async Task ManuallyImportBalanceAndReCalcAsync(List<BalanceManuallyImportRequest> requests)
@@ -569,22 +531,13 @@ public class BalanceService : IBalanceService
         var onlineDevices = deviceRegistries
             .Where(x =>
             {
-                if (x.HeartbeatInterval <= 0)
-                {
-                    return true;
-                }
-
-                return x.LastHeartbeatTime.AddSeconds(x.HeartbeatInterval * 3) >= now;
-            })
-            .Select(x => new
-            {
-                x.UniqueNo,
+                if (x.HeartbeatInterval <= 0) return true;
+                return x.LastHeartbeatTime >= now;
             })
+            .Select(x => x.UniqueNo)
             .ToList();
-        var onlineUniqueNos = new List<string>();
-        onlineDevices.ForEach(x => onlineUniqueNos.Add(x.UniqueNo));
 
-        var offUniqueNos = deviceUniqueNos.Except(onlineUniqueNos).ToList();
+        var offUniqueNos = deviceUniqueNos.Except(onlineDevices).ToList();
         var list = devices.Where(x => offUniqueNos.Contains(x.UniqueNo)).ToList();
         return list;
     }