From 23d3e1028b68ab26ff6f7b259af8bd305851e220 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 14 Aug 2024 15:43:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/OrderService.cs | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index bea63211..2a508b8d 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -583,12 +583,29 @@ public class OrderService : BaseOrderService, IOrderService
 
             try
             {
-                await EMealVoucherConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo);
+                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
         {
@@ -692,7 +709,6 @@ public class OrderService : BaseOrderService, IOrderService
 
     private async Task EMealVoucherConsumeAsync(ConsumeRequest request, GainfoEntity gainfo, string originData, string no, string ts, string idNo)
     {
-
         var nowDate = DateTime.Now.Date;
         var current = await DbContext.Queryable<EMealVoucherDetailEntity>()
             .Where(x => x.No == no && x.IdNo == idNo).SingleAsync();
@@ -767,7 +783,6 @@ public class OrderService : BaseOrderService, IOrderService
                 .SetColumns(x => x.ModifiedTime == DateTime.Now)
                 .Where(x => x.Id == orderId)
                 .ExecuteCommandAsync();
-
         }
         catch (Exception ex)
         {