From 856543d74f090d0f580550663a53f74992e38b73 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 26 Jun 2024 13:03:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20gainfo.id=E7=A9=BA=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/OrderService.cs    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index a02be9e0..3edd2716 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -111,11 +111,13 @@ public class OrderService : BaseOrderService, IOrderService
             }
         }
 
+        var gainfoId = gainfo?.Id ?? 0;
+
         //获取人员余额
         var data = await DbContext.Queryable<GainfoEntity>()
             .LeftJoin<DepartmentEntity>((ga, department) => ga.DepartmentNo == department.No)
             .LeftJoin<GainfoMealEntity>((ga, department, mealUser) => ga.No == mealUser.UserNo)
-            .Where(ga => ga.Id == gainfo.Id)
+            .Where(ga => ga.Id == gainfoId)
             .Select((ga, department, mealUser) => new OrderResultResponse
             {
                 UserCode = ga.Code,
@@ -362,6 +364,12 @@ public class OrderService : BaseOrderService, IOrderService
                     Image = request.Image
                 });
             }
+
+            await DbContext.Updateable<CanteenOrderEntity>()
+                .SetColumns(x => x.OrderStatus == CanteenOrderStatusEnumType.Success)
+                .SetColumns(x => x.ModifiedTime == DateTime.Now)
+                .Where(x => x.Id == orderId)
+                .ExecuteCommandAsync();
         }
         catch (Exception ex)
         {
@@ -374,12 +382,6 @@ public class OrderService : BaseOrderService, IOrderService
 
             throw;
         }
-
-        await DbContext.Updateable<CanteenOrderEntity>()
-            .SetColumns(x => x.OrderStatus == CanteenOrderStatusEnumType.Success)
-            .SetColumns(x => x.ModifiedTime == DateTime.Now)
-            .Where(x => x.Id == orderId)
-            .ExecuteCommandAsync();
     }
 
     public async Task<Pagination<OrderAggregationResponse>> GetOrdersAggregationAsync(PageDto page)