From 7432fae1034aa81d621dcb213bea04de1f01e0c5 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 19 Mar 2024 18:02:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=85=8D=E9=80=81=E7=82=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs       | 5 +++++
 Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs | 1 +
 Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs     | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs b/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs
index 9872a497..525e27d2 100644
--- a/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs
@@ -36,6 +36,11 @@ public class BookingMealRequest : IValidatableObject
     [EnumDataType(typeof(BalanceRecordSourceEnumType))]
     public BalanceRecordSourceEnumType Source { get; set; }
 
+    /// <summary>
+    /// 配送地址
+    /// </summary>
+    [Required]
+    public string DeliveryAddress { get; set; }
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index e390d2ca..a7494d59 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -102,6 +102,7 @@ public class OrderService : IOrderService
             CostId = gainfo.CostId,
             DepartmentNo = gainfo.DepartmentNo,
             DeviceUniqueNo = string.Empty,
+            DeliveryAddress = request.DeliveryAddress,
 
             No = SnowFlakeHelper.Instance.NextId().ToString(),
             SubsidiesFromMonth = now.ToString("yyyyMM"),
diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs
index 38195904..2a927612 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs
@@ -34,6 +34,12 @@ public class CanteenOrderEntity : BalanceRecordEntity
     [SugarColumn(ColumnDataType = "bit", ColumnDescription = "请求json")]
     public bool IsOffline { get; set; }
 
+    /// <summary>
+    /// 配送地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "配送地址")]
+    public string DeliveryAddress { get; set; }
+
     /// <summary>
     /// 处理结果
     /// </summary>