From c78b4f923c396eeec29c8ebc7997a65931e59bbc Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 12 Jan 2024 11:15:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0post=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Controllers/BalancesController.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index 59c3f328..62786b5c 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -39,7 +39,18 @@ public class BalancesController : ControllerBase /// /// [HttpGet("device/page")] - public async Task> GetPageByDeviceUniqueNoAsync([FromQuery] BalanceRecordPageByDeviceUniqueNoRequest request) + public async Task> GetPageByDeviceUniqueNoGetAsync([FromQuery] BalanceRecordPageByDeviceUniqueNoRequest request) + { + return await _balanceService.GetPageByDeviceUniqueNoAsync(request); + } + + /// + /// 设备消费记录 + /// + /// + /// + [HttpPost("device/page")] + public async Task> GetPageByDeviceUniqueNoPostAsync(BalanceRecordPageByDeviceUniqueNoRequest request) { return await _balanceService.GetPageByDeviceUniqueNoAsync(request); } From bbab1f4460f8232b968e580f0e1c524d0e4f21c6 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 12 Jan 2024 11:40:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index dce74362..2ebfb3d2 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -72,7 +72,7 @@ public class BalanceService : IBalanceService if (request.SearchDate.HasValue) { now = request.SearchDate.Value; - start = new DateTime(now.Year, now.Month, now.Day, 0, 0, 1); + start = new DateTime(now.Year, now.Month, now.Day); end = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59); }