diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs index 18e64f9e..65fdd22e 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs @@ -10,13 +10,11 @@ public interface IBalanceSummaryService : IScopeDependency Task BalanceRecordAnalysisAsync(BalanceRecordAnalysisRequest request); Task> BalanceRecordAnalysisByDepartmentAsync(SummaryCommonDto request); + Task> BalanceRecordAnalysisByCostAsync(SummaryCommonDto request); Task BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request); Task BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request); - Task BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request); - - Task BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request); } \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index aac0c297..c09b1cc2 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -542,39 +542,6 @@ public class OrderService : BaseOrderService, IOrderService }; } else - { - if (request.IsOffline) - { - if (request.ThirdNo.IsPresent()) - { - - try - { - await EMealVoucherConsumeAsync(request.Adapt(), gainfo, eMealVoucherQrCode.OriginData, no, ts, idNo); - } - catch (Exception ex) - { - message = ex.Message; - } - - //获取餐券余额 - var data = await DbContext.Queryable() - .LeftJoin((x, d) => x.No == d.No) - .Where((x, d) => d.IdNo == idNo) - .Select((x, d) => new OrderResultResponse - { - CurrentBalance = d.Balance - }) - .SingleAsync(); - - return new DefaultApiResult - { - Code = message.IsPresent() ? ApiStateCode.Error : ApiStateCode.Success, - Data = data, - Msg = message - }; - } - else { if (request.IsOffline) { @@ -642,7 +609,7 @@ public class OrderService : BaseOrderService, IOrderService Msg = message }; } - + async Task ToCheckAbleOfflineConsumeAsync(string thirdNo) { var order = await DbContext.Queryable() @@ -680,6 +647,7 @@ public class OrderService : BaseOrderService, IOrderService var current = await DbContext.Queryable() .Where(x => x.No == no && x.IdNo == idNo).SingleAsync(); (nowDate >= current.Start && nowDate <= current.End).ThrowIfFalse("餐券已过期"); + var time = DateTimeOffset.FromUnixTimeMilliseconds(Convert.ToInt64(ts.Reverse().Join(string.Empty))).ToLocalTime().DateTime; (time.AddMinutes(60) >= DateTime.Now).ThrowIfFalse("餐券二维码已过期");