From ed25ab626ad5461e63e07c2ab9b4ddfa2e90cb6d Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Tue, 19 Mar 2024 09:58:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=94=E5=9B=9E=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=AD=E6=96=87=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/BalanceRecordSourceEnumDto.cs    | 11 ++++
 .../Response/GetDishesMenusBookingResponse.cs |  2 +-
 .../Services/Implements/DishesService.cs      | 64 ++++++++++---------
 3 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 Src/Dlhis.Basic/Dishes/Response/BalanceRecordSourceEnumDto.cs

diff --git a/Src/Dlhis.Basic/Dishes/Response/BalanceRecordSourceEnumDto.cs b/Src/Dlhis.Basic/Dishes/Response/BalanceRecordSourceEnumDto.cs
new file mode 100644
index 00000000..9740a562
--- /dev/null
+++ b/Src/Dlhis.Basic/Dishes/Response/BalanceRecordSourceEnumDto.cs
@@ -0,0 +1,11 @@
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Basic.Dishes.Response
+{
+    public class BalanceRecordSourceEnumDto
+    {
+        public BalanceRecordSourceEnumType Type { get; set; }
+        public string TypeCN => Type.GetDescription();
+    }
+}
diff --git a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
index 5d21e26f..5473a443 100644
--- a/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
+++ b/Src/Dlhis.Basic/Dishes/Response/GetDishesMenusBookingResponse.cs
@@ -10,6 +10,6 @@ namespace Dlhis.Basic.Dishes.Response
 
         public DateTime ServiceTime { get; set; }
 
-        public List<BalanceRecordSourceEnumType> PayType { get; set; }
+        public List<BalanceRecordSourceEnumDto> PayTypes { get; set; }
     }
 }
diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
index 51be49b2..08b29ecd 100644
--- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
+++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
@@ -62,47 +62,52 @@ public class DishesService : IDishesService
 
     public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request)
     {
-        try
+        // 读取最晚订餐的时间
+        var strDatetime = await _dbContext.Queryable<CanteenSettingEntity>()
+            .Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Tenant && x.Item == CanteenSettingItemEnumType.BookingDeadline && x.Enable)
+            .Select(x => x.Value)
+            .FirstAsync();
+
+        DateTime dateTime;
+        DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out dateTime);
+
+        var res = new GetDishesMenusBookingResponse
         {
-            var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
+            ServiceTime = dateTime,
+        };
+
+        var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
             .Where(x => x.PlaceCode == request.PlaceCode)
             .FirstAsync();
 
-            var BusinessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
-                .Where(x => x.ShiftCode == shift.ShiftCode)
-                .Select<BusinessShiftMealRelationshipResponse>()
-                .ToListAsync();
+        var payTypes = new List<BalanceRecordSourceEnumDto>();
+        var dto1 = new BalanceRecordSourceEnumDto
+        {
+            Type = BalanceRecordSourceEnumType.Cash
+        };
+        payTypes.Add(dto1);
 
-            // 读取最晚订餐的时间
-            var strDatetime = await _dbContext.Queryable<CanteenSettingEntity>()
-                .Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Tenant  && x.Item == CanteenSettingItemEnumType.BookingDeadline && x.Enable)
-                .Select(x => x.Value)
-                .FirstAsync();
+        if (shift != null)
+        {
+            var businessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
+               .Where(x => x.ShiftCode == shift.ShiftCode)
+               .Select<BusinessShiftMealRelationshipResponse>()
+               .ToListAsync();
+            res.BusinessShiftMealRelationships = businessShiftMealRelationships;
 
-            DateTime dateTime;
-            DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None,  out dateTime);
-
-
-            var payTypes = new List<BalanceRecordSourceEnumType> { BalanceRecordSourceEnumType.Cash };
             if (shift.TenantId == request.Factory)
             {
-                payTypes.Add(BalanceRecordSourceEnumType.LocalTenantSubsidies);
+                var dto2 = new BalanceRecordSourceEnumDto
+                {
+                    Type = BalanceRecordSourceEnumType.LocalTenantSubsidies
+                };
+                payTypes.Add(dto2);
             }
 
-            var res = new GetDishesMenusBookingResponse
-            {
-                BusinessShiftMealRelationships = BusinessShiftMealRelationships,
-                ServiceTime = dateTime,
-                PayType = payTypes
-            };
-            return res;
         }
-        catch (Exception ex)
-        {
-            return new GetDishesMenusBookingResponse();
+        res.PayTypes = payTypes;
+        return res;
         }
-        
-    }
 
     public async Task<DishesDetailResponse> GetDishesDetailByIdAsync(long id)
     {
@@ -112,3 +117,4 @@ public class DishesService : IDishesService
             .SingleAsync();
     }
 }
+