Merge remote-tracking branch 'origin/development' into development

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

@@ -60,7 +60,7 @@ public class BalanceSummaryController : ControllerBase
     public async Task<BalanceRecordAnalysisShiftAmountAndCountResponse> BalanceRecordShiftAnalysisAmountAndCountAsync([FromQuery] BalanceRecordAnalysisByShiftRequest request)
     {
         return await _balanceSummaryService.BalanceRecordShiftAnalysisAmountAndCountAsync(request);
-}
+    }
 
     /// <summary>
     /// 餐次用餐分析,统计金额和人数

Src/Dlhis.Canteen/Order/Services/IBalanceSummaryService.cs

@@ -13,8 +13,4 @@ public interface IBalanceSummaryService : IScopeDependency
     Task<BalanceRecordAnalysisShiftAmountResponse> BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request);
 
     Task<BalanceRecordAnalysisShiftAmountAndCountResponse> BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request);
-
-    Task<BalanceRecordAnalysisShiftAmountResponse> BalanceRecordShiftAnalysisAmountAsync(BalanceRecordAnalysisByShiftRequest request);
-
-    Task<BalanceRecordAnalysisShiftAmountAndCountResponse> BalanceRecordShiftAnalysisAmountAndCountAsync(BalanceRecordAnalysisByShiftRequest request);
 }

Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs

@@ -576,39 +576,7 @@ public class OrderService : BaseOrderService, IOrderService
         }
         else
         {
-            if (request.IsOffline)
+           
-            {
-                if (request.ThirdNo.IsPresent())
-                {
-
-            try
-            {
-                await EMealVoucherConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo, eMealVoucherQrCode.OriginData, no, ts, idNo);
-            }
-            catch (Exception ex)
-            {
-                message = ex.Message;
-            }
-
-            //获取餐券余额
-            var data = await DbContext.Queryable<EMealVoucherEntity>()
-                .LeftJoin<EMealVoucherDetailEntity>((x, d) => x.No == d.No)
-                .Where((x, d) => d.IdNo == idNo)
-                .Select((x, d) => new OrderResultResponse
-                {
-                    CurrentBalance = d.Balance
-                })
-                .SingleAsync();
-
-            return new DefaultApiResult<OrderResultResponse>
-            {
-                Code = message.IsPresent() ? ApiStateCode.Error : ApiStateCode.Success,
-                Data = data,
-                Msg = message
-            };
-        }
-        else
-        {
             if (request.IsOffline)
             {
                 if (request.ThirdNo.IsPresent())