diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index 9f206652..a94dc314 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -147,6 +147,7 @@ public class BalancesController : ControllerBase
return await _balanceService.GetConsumeNumberAsync();
}
+
///
/// 获取消费机详情
///
diff --git a/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs
new file mode 100644
index 00000000..ad309eb9
--- /dev/null
+++ b/Src/Dlhis.Canteen/Order/Response/SpendingDetailResponse.cs
@@ -0,0 +1,24 @@
+using SqlSugar;
+
+namespace Dlhis.Canteen.Order.Response
+{
+ public class SpendingDetailResponse
+ {
+ ///
+ /// 档案号
+ ///
+ public string No { get; set; }
+
+ ///
+ /// 姓名
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// 学工号
+ ///
+ public string Code { get; set; }
+
+
+ }
+}
diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
index 90847d70..73c3497a 100644
--- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
@@ -27,6 +27,8 @@ public interface IBalanceService : IScopeDependency
Task GetConsumeNumberAsync();
+
+
Task> GetConsumeDeviceAsync(GetConsumeDeviceRequest request);
Task DispositionDeviceAsync(DispositionDeviceRequest request);
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 2aea8546..94370d33 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -562,6 +562,7 @@ public class BalanceService : IBalanceService
var offCount = await GetOfflineDevicesCount(devices);
var places = await _dbContext.Queryable()
+ .Where(x =>x.Status == CanteenBusinessPlaceStatusEnumType.Opened)
.ToListAsync();
var time = DateTime.Now.ToString("yyyy-MM-dd");
@@ -598,6 +599,8 @@ public class BalanceService : IBalanceService
}
+
+
public async Task> GetConsumeDeviceAsync(GetConsumeDeviceRequest request)
{
if (request.IsOff)
@@ -743,11 +746,16 @@ public class BalanceService : IBalanceService
place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在");
var devices = await _dbContext.Queryable().ToListAsync();
- foreach (var no in request.UniqueNos)
+
+ if (request.UniqueNos!=null && request.UniqueNos.Count > 0)
{
- var device = devices.Where(x => x.UniqueNo == no).First();
- device.ThrowIfNull($"{no}:设备不存在");
+ foreach (var no in request.UniqueNos)
+ {
+ var device = devices.Where(x => x.UniqueNo == no).First();
+ device.ThrowIfNull($"{no}:设备不存在");
+ }
}
+
var regiss = await _dbContext.Queryable()
.Where(x => request.UniqueNos.Contains(x.DeviceUniqueNo))
.ToListAsync();
diff --git a/Src/Dlhis.Common/Services/ApiLogService.cs b/Src/Dlhis.Common/Services/ApiLogService.cs
index b25c9ed3..2a6b9550 100644
--- a/Src/Dlhis.Common/Services/ApiLogService.cs
+++ b/Src/Dlhis.Common/Services/ApiLogService.cs
@@ -6,6 +6,7 @@ using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
+using SqlSugar;
namespace Dlhis.Common.Services
{
@@ -23,6 +24,7 @@ namespace Dlhis.Common.Services
var logs = await _dbContext.ChangeDb("log").Queryable()
.WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
.WhereIF(request.Level.HasValue, x => x.Level == request.Level)
+ .OrderBy(x => x.Timestamp,OrderByType.Desc)
.Select()
.ToPageListAsync(request);