diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index 00b9eae8..99d8ce14 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -129,27 +129,6 @@ public class BalancesController : ControllerBase
return await _balanceService.GetConsumeNumberAsync();
}
- ///
- /// 消费人数详情
- ///
- ///
- [HttpGet("spendingDetails")]
- public async Task> GetSpendingDetailsAsync([FromQuery] SpendingDetailRequest request)
- {
- return await _balanceService.GetSpendingDetailsAsync(request);
- }
-
- ///
- /// 日消费均额
- ///
- ///
- ///
- [HttpGet("averageDaily")]
- public async Task> AverageDailyAsync([FromQuery] AverageDailyRequest request)
- {
- return await _balanceService.AverageDailyAsync(request);
- }
-
///
/// 手动处理余额
///
diff --git a/Src/Dlhis.Canteen/Order/Request/AverageDailyRequest.cs b/Src/Dlhis.Canteen/Order/Request/AverageDailyRequest.cs
deleted file mode 100644
index 9251037e..00000000
--- a/Src/Dlhis.Canteen/Order/Request/AverageDailyRequest.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Kurisu.AspNetCore.DataAccess.Dto;
-
-namespace Dlhis.Canteen.Order.Request
-{
- public class AverageDailyRequest : PageDto
- {
- }
-}
diff --git a/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs
deleted file mode 100644
index 6d994779..00000000
--- a/Src/Dlhis.Canteen/Order/Request/SpendingDetailRequest.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Kurisu.AspNetCore.DataAccess.Dto;
-
-namespace Dlhis.Canteen.Order.Request
-{
- public class SpendingDetailRequest : PageDto
- {
- }
-}
diff --git a/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs b/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs
deleted file mode 100644
index 01df623b..00000000
--- a/Src/Dlhis.Canteen/Order/Response/AverageDailyResponse.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Dlhis.Canteen.Order.Response;
-
-public class AverageDailyResponse
-{
- ///
- /// 档案号/QRCode
- ///
- public string UserNo { get; set; }
-
- ///
- /// 姓名
- ///
- public string Name { get; set; }
-
- ///
- /// 学工号
- ///
- public string UserCode { get; set; }
-
- ///
- /// 日消费均额
- ///
- public decimal AverageAmount { get; set; }
-}
diff --git a/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs b/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
index 7642fe08..93c92406 100644
--- a/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
@@ -17,11 +17,6 @@ public class ConsumeNumberResponse
///
public int PlaceNumber { get; set; }
- ///
- /// 可消费人数
- ///
- public int ConsumerableNumber { get; set; }
-
///
/// 人均日消费额
///
diff --git a/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs
deleted file mode 100644
index c81f720a..00000000
--- a/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace Dlhis.Canteen.Order.Response;
-
-public class SpendingDetailResponse
-{
- ///
- /// 档案号/QRCode
- ///
- public string UserNo { get; set; }
-
- ///
- /// 姓名
- ///
- public string Name { get; set; }
-
- ///
- /// 学工号
- ///
- public string UserCode { get; set; }
-
- ///
- /// 部门号
- ///
- public string DepartmentNo { get; set; }
-
- ///
- /// 成本中心
- ///
- public string CostId { get; set; }
-
- ///
- /// 消费者所在基地
- ///
- public string OriginTenantId { get; set; }
-
-}
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
index 4efc0902..0c7b9c39 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
@@ -11,11 +11,9 @@ public interface IBalanceService : IScopeDependency
Task> GetPageByDeviceUniqueNoAsync(BalanceRecordPageByDeviceUniqueNoRequest request);
Task GetPageByUserAsync(BalanceRecordUserPageRequest request);
-
-
+
Task> GetUserBalanceGroupAsync(BalanceRecordUserGroupPageRequest request);
-
-
+
Task SupplementBalanceAsync(BalanceSupplementRequest request);
///
@@ -34,10 +32,5 @@ public interface IBalanceService : IScopeDependency
Task GetConsumeNumberAsync();
- Task> GetSpendingDetailsAsync(SpendingDetailRequest request);
-
- Task> AverageDailyAsync(AverageDailyRequest request);
-
-
Task ManuallyImportBalanceAndReCalcAsync(List requests);
}
\ No newline at end of file
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 01da552b..a7799b10 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/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()
- .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> GetSpendingDetailsAsync(SpendingDetailRequest request)
- {
- return await _dbContext
- .Queryable()
- .Where(x => x.Type == BalanceRecordTypeEnumType.Out)
- .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
- .Select()
- .Distinct()
- .ToPageListAsync(request);
- }
-
- public async Task> AverageDailyAsync(AverageDailyRequest request)
- {
- return await _dbContext.Queryable()
- .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);
- }
-
///
public async Task ManuallyImportBalanceAndReCalcAsync(List 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();
- 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;
}