Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs

@@ -39,7 +39,18 @@ public class BalancesController : ControllerBase
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpGet("device/page")]
-    public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoAsync([FromQuery] BalanceRecordPageByDeviceUniqueNoRequest request)
+    public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoGetAsync([FromQuery] BalanceRecordPageByDeviceUniqueNoRequest request)
+    {
+        return await _balanceService.GetPageByDeviceUniqueNoAsync(request);
+    }
+
+    /// <summary>
+    /// 设备消费记录
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("device/page")]
+    public async Task<Pagination<BalanceRecordResponse>> GetPageByDeviceUniqueNoPostAsync(BalanceRecordPageByDeviceUniqueNoRequest request)
     {
         return await _balanceService.GetPageByDeviceUniqueNoAsync(request);
     }

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);
         }