Squashed commit of the following:

commit afdd9e6f14 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:48:05 2024 +0800 fix 价格默认获取菜单中的设置 commit a3cfc472c8 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:40:04 2024 +0800 fix 时间范围逻辑 commit 83f8906f12 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:32:55 2024 +0800 fix 时间范围逻辑 commit 35660b1d0c Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:29:36 2024 +0800 fix 数据范围罗逻辑修改 commit 7407955bc5 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:14:06 2024 +0800 fix 分类树增加营业点参数 commit ed5196d1a1 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:02:52 2024 +0800 feat 用户创建 commit d25909a235 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:51:20 2024 +0800 fix 菜单明细调整 commit 8915f9ff0f Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:42:08 2024 +0800 fix 判断提前 commit 45aa52aa2a Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:34:22 2024 +0800 fix 逻辑取反 commit 89904fead1 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:23:20 2024 +0800 fix 菜单时效范围 commit 573911f907 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 19:13:33 2024 +0800 fix 订单聚合返回状态 commit 93c38be18a Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 18:40:12 2024 +0800 fix 订单查询 commit e256d18d36 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 18:14:33 2024 +0800 fix 订单取消接口,分页权限控制 commit 1218aec811 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 17:32:45 2024 +0800 fix 营业点权限控制优化 commit 226c61ee41 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 17:09:42 2024 +0800 fix tenantId赋值 commit 28d2c1d8d4 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 17:05:37 2024 +0800 fix ignoretenant commit 5ae6dd97b4 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:53:40 2024 +0800 fix ignoretenant commit 4c866eaf3f Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:40:24 2024 +0800 feat 获取所有地址 commit 2ca8f2db49 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:22:47 2024 +0800 fix 优化查询 commit 212a1fa073 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:01:49 2024 +0800 fix 临时数据模拟 commit 0eb76e878c Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 15:48:59 2024 +0800 fix 处理删除缺少判断 commit c582fb40c0 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 15:40:22 2024 +0800 fix 查询优化 commit 6d3a19b283 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:48:45 2024 +0800 fix 错误值修改 commit c39f77008d Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:31:50 2024 +0800 fix 营业点控制(admin),unit返回 commit a5dcab1d07 Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:16:23 2024 +0800 fix 营业点分页控制 commit 02084be82b Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:01:14 2024 +0800 fix 分类控制菜品获取 commit 96c5c5feba Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 10:39:58 2024 +0800 fix DI commit 367ede2eeb Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 10:35:24 2024 +0800 fix 订餐返回当前信息,增加数量入参和响应 commit 0e1f6cb4a0 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 16:40:10 2024 +0800 fix 餐补查询代码调整 commit 21fc2f78d3 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 15:52:46 2024 +0800 fix 支付批量操作 commit 878b44a146 Merge: a90d4e6 bf5c937 Author: cheche <717840555@qq.com> Date: Wed Mar 20 15:27:39 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit a90d4e66a7 Author: cheche <717840555@qq.com> Date: Wed Mar 20 15:27:37 2024 +0800 fix 餐补查询及日志删除 commit bf5c937037 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 15:12:30 2024 +0800 fix 补充营业点分配权限接口 commit 07672f1d32 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 13:56:33 2024 +0800 fix 优化changeDb commit 7090ee4a33 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 13:41:25 2024 +0800 fix 敏感信息混淆 commit 4366b68831 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 12:42:48 2024 +0800 fix 代码优化 commit 03b73515b5 Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 10:59:08 2024 +0800 fix tree返回营业点 commit 1ce60bedc2 Merge: aba4fa7 2d83930 Author: cheche <717840555@qq.com> Date: Wed Mar 20 09:55:17 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit aba4fa7ee9 Author: cheche <717840555@qq.com> Date: Wed Mar 20 09:55:13 2024 +0800 fix 删除日志优化 commit 2d8393068f Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 20:53:16 2024 +0800 feat 订单聚合接口 commit 0cde1d3d92 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 20:03:06 2024 +0800 fix 表名称调整 commit f003e30169 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 19:51:56 2024 +0800 fix 订餐null异常处理 commit f427338715 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 18:43:19 2024 +0800 feat 获取菜品 commit 3a65d95701 Merge: 9a7091b 7432fae Author: cheche <717840555@qq.com> Date: Tue Mar 19 18:36:16 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit 9a7091b4e0 Author: cheche <717840555@qq.com> Date: Tue Mar 19 18:36:14 2024 +0800 fix 删除日志try commit 7432fae103 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 18:02:31 2024 +0800 fix 配送点增加 commit ecd162c7af Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 17:51:15 2024 +0800 fix 预定就餐送货地点 commit 1c7a054ed4 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 15:53:22 2024 +0800 feat 获取所有营业点接口 commit 84398a566e Merge: 217d9f7 84b4025 Author: cheche <717840555@qq.com> Date: Tue Mar 19 15:26:42 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit 217d9f7770 Author: cheche <717840555@qq.com> Date: Tue Mar 19 15:26:40 2024 +0800 feat 配送点管理 commit 84b402538e Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 14:59:21 2024 +0800 fix 菜单分页响应调整,增加详情接口 commit 098d7c7e9d Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 14:26:24 2024 +0800 fix 代码优化
2024-03-21 22:04:52 +08:00
parent 15d98356ae
commit 3ea432943f
148 changed files with 2331 additions and 1569 deletions
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs
@@ -0,0 +1,24 @@
+namespace Dlhis.Canteen.Order.Response;
+
+public class BalanceRecordByUserResponse
+{
+    /// <summary>
+    /// 流水号
+    /// </summary>
+    public string No { get; set; }
+
+    /// <summary>
+    /// 金额
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// 消费时间
+    /// </summary>
+    public DateTime CostDateTime { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+}
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordUserResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordUserResponse.cs
@@ -49,4 +49,15 @@ public class BalanceRecordUserResponse
    /// 记录产生日期
    /// </summary>
    public DateTime CostDateTime { get; set; }
+
+
+    /// <summary>
+    /// 消费应用类型
+    /// </summary>
+    public CanteenApplicaitonTypeEnumType ApplicationType { get; set; }
+
+    /// <summary>
+    /// 消费应用类型
+    /// </summary>
+    public string ApplicationTypeDesc => ApplicationType.GetDescription();
 }
--- a/Src/Dlhis.Canteen/Order/Response/BookingResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BookingResponse.cs
@@ -0,0 +1,32 @@
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Canteen.Order.Response;
+
+public class BookingResponse
+{
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    public string No { get; set; }
+
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+
+    /// <summary>
+    /// 消费金额
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// 支付方式
+    /// </summary>
+    public BalanceRecordSourceEnumType Source { get; set; }
+
+    /// <summary>
+    /// 支付方式
+    /// </summary>
+    public string SourceDesc => Source.GetDescription();
+}
--- a/Src/Dlhis.Canteen/Order/Response/DishesDto.cs
+++ b/Src/Dlhis.Canteen/Order/Response/DishesDto.cs
@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+
+namespace Dlhis.Canteen.Order.Response;
+
+public class DishesDto
+{
+    [JsonIgnore]
+    public string No { get; set; }
+
+    /// <summary>
+    /// 菜品编码
+    /// </summary>
+    public string DishesCode { get; set; }
+
+    /// <summary>
+    /// 菜品名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 购买单价
+    /// </summary>
+    public decimal Price { get; set; }
+
+    /// <summary>
+    /// 购买数量
+    /// </summary>
+    public int Number { get; set; }
+
+    /// <summary>
+    /// 图片
+    /// </summary>
+    public string ImageUrl { get; set; }
+}
--- a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs
@@ -1,67 +0,0 @@
-using Dlhis.Entity.Canteen.Enums;
-using Kurisu.AspNetCore.Utils.Extensions;
-
-namespace Dlhis.Canteen.Order.Response;
-
-public class GetDetailResponse
-{
-    /// <summary>
-    /// 订单号
-    /// </summary>
-    public string ThirdNo { get; set; }
-
-    /// <summary>
-    /// 营业日
-    /// </summary>
-    public DateOnly SysDate { get; set; }
-
-    /// <summary>
-    /// 餐次
-    /// </summary>
-    public ShiftEnumType ShiftType { get; set; }
-
-    /// <summary>
-    /// 餐次CN
-    /// </summary>
-    public string ShiftTypeCN => ShiftType.GetDescription();
-
-    /// <summary>
-    /// 菜品编码
-    /// </summary>
-    public Guid DishesCode { get; set; }
-
-    /// <summary>
-    /// 菜品名称
-    /// </summary>
-    public string DishesName { get; set; }
-
-    /// <summary>
-    /// 单价
-    /// </summary>
-    public decimal Price { get; set; }
-
-    /// <summary>
-    /// 单位
-    /// </summary>
-    public string Unit { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    public int Num { get; set; }
-
-    /// <summary>
-    /// 金额
-    /// </summary>
-    public decimal Amount { get; set; }
-
-    /// <summary>
-    /// 订单明细状态
-    /// </summary>
-    public OrderDetailsStatusEnumType OrderStatus { get; set; }
-
-    /// <summary>
-    /// 订单明细状态CN
-    /// </summary>
-    public string OrderStatusCN => OrderStatus.GetDescription();
-}
--- a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherDetailResponse.cs
@@ -1,65 +0,0 @@
-using SqlSugar;
-
-namespace Dlhis.Canteen.Order.Response
-{
-    public class OaEMealVoucherDetailResponse
-    {
-        public long Id { get; set; }
-
-        public long VoucherId { get; set; }
-
-        public int Sequence { get; set; }
-
-        public string DinnerType { get; set; }
-
-        /// <summary>
-        /// 身份证
-        /// </summary>
-        public string IdNo { get; set; }
-
-        /// <summary>
-        /// 用餐人
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 手机号
-        /// </summary>
-        public string Phone { get; set; }
-
-        /// <summary>
-        /// 就餐开始
-        /// </summary>
-        public DateTime Start { get; set; }
-
-        /// <summary>
-        /// 就餐结束
-        /// </summary>
-        public DateTime End { get; set; }
-
-        /// <summary>
-        /// 就餐天数
-        /// </summary>
-        public int Days { get; set; }
-
-        /// <summary>
-        /// 金额
-        /// </summary>
-        public decimal Amount { get; set; }
-
-        /// <summary>
-        /// 二维码
-        /// </summary>
-        public string QrCode { get; set; }
-
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// 信息
-        /// </summary>
-        public string Message { get; set; }
-    }
-}
--- a/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OaEMealVoucherResponse.cs
@@ -1,97 +0,0 @@
-namespace Dlhis.Canteen.Order.Response;
-
-public class OaEMealVoucherResponse
-{
-    public long Id { get; set; }
-
-    /// <summary>
-    /// 标题
-    /// </summary>
-    public string Title { get; set; }
-
-    /// <summary>
-    /// 申请人工号
-    /// </summary>
-    public string UserCode { get; set; }
-
-    /// <summary>
-    /// 申请人名称
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// 基地代码
-    /// </summary>
-    public string TenantId { get; set; }
-
-    /// <summary>
-    /// 基地名称
-    /// </summary>
-    public string TenantName { get; set; }
-
-    /// <summary>
-    /// 成本中心
-    /// </summary>
-    public string CostId { get; set; }
-
-    /// <summary>
-    /// 成本中心名称
-    /// </summary>
-    public string CostName { get; set; }
-
-    /// <summary>
-    /// 来宾公司
-    /// </summary>
-    public string Company { get; set; }
-
-    /// <summary>
-    /// 联系人
-    /// </summary>
-    public string Phone { get; set; }
-
-    /// <summary>
-    /// 来宾人数
-    /// </summary>
-    public int Num { get; set; }
-
-    /// <summary>
-    /// 就餐食堂
-    /// </summary>
-    public string Canteen { get; set; }
-
-    /// <summary>
-    /// 就餐事由
-    /// </summary>
-    public string Reason { get; set; }
-
-    /// <summary>
-    /// 就餐次
-    /// </summary>
-    public string CanteenShift { get; set; }
-
-    /// <summary>
-    /// oa流程id
-    /// </summary>
-    public string OaId { get; set; }
-
-    /// <summary>
-    /// 部门号
-    /// </summary>
-    public string DepartmentNo { get; set; }
-
-    /// <summary>
-    /// 部门名称
-    /// </summary>
-    public string DepartmentName { get; set; }
-
-
-    /// <summary>
-    /// 申请日期
-    /// </summary>
-    public DateTime LogDate { get; set; }
-
-    /// <summary>
-    /// 数据创建时间
-    /// </summary>
-    public DateTime CreateTime { get; set; }
-}
--- a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
@@ -0,0 +1,67 @@
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Canteen.Order.Response;
+
+public class OrderAggregationResponse
+{
+    public string No { get; set; }
+
+    /// <summary>
+    /// 营业点
+    /// </summary>
+    public string BusinessPlaceName { get; set; }
+
+    /// <summary>
+    /// 购买菜品
+    /// </summary>
+    public List<DishesDto> Dishes { get; set; }
+
+
+    /// <summary>
+    /// 金额
+    /// </summary>
+    public decimal Amount
+    {
+        get
+        {
+            if (Dishes.IsPresent())
+            {
+                return Dishes.Sum(x => x.Number * x.Price);
+            }
+
+            return 0;
+        }
+    }
+
+    /// <summary>
+    /// 共计数量
+    /// </summary>
+    public int Count
+    {
+        get
+        {
+            if (Dishes.IsPresent())
+            {
+                return Dishes.Count;
+            }
+
+            return 0;
+        }
+    }
+
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 订单状态
+    /// </summary>
+    public CanteenOrderStatusEnumType OrderStatus { get; set; }
+
+
+    public string OrderStatusDesc => OrderStatus.GetDescription();
+}
--- a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
@@ -0,0 +1,58 @@
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
+
+namespace Dlhis.Canteen.Order.Response;
+
+public class OrderBookingResponse
+{
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    public string No { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 配送地址
+    /// </summary>
+    public string DeliveryAddress { get; set; }
+
+    /// <summary>
+    /// 订单金额
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// 工号
+    /// </summary>
+    public string UserCode { get; set; }
+
+    /// <summary>
+    /// 用户
+    /// </summary>
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 餐次
+    /// </summary>
+    public ShiftEnumType? ShiftType { get; set; }
+
+    /// <summary>
+    /// 餐次
+    /// </summary>
+    public string ShiftTypeDesc => ShiftType.GetDescription();
+
+
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+
+
+    public CanteenOrderStatusEnumType Status { get; set; }
+
+    public string StatusDesc => Status.GetDescription();
+}
--- a/Src/Dlhis.Canteen/Order/Response/OrderDetailResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderDetailResponse.cs
@@ -0,0 +1,34 @@
+//namespace Dlhis.Canteen.Order.Response;
+
+//public class OrderDetailResponse
+//{
+//    /// <summary>
+//    /// 菜品编码
+//    /// </summary>
+//    public string DishesCode { get; set; }
+
+//    /// <summary>
+//    /// 菜品名称
+//    /// </summary>
+//    public string Name { get; set; }
+
+//    /// <summary>
+//    /// 单价
+//    /// </summary>
+//    public decimal Price { get; set; }
+
+//    /// <summary>
+//    /// 数量
+//    /// </summary>
+//    public int Number { get; set; }
+
+//    /// <summary>
+//    /// 单位
+//    /// </summary>
+//    public string Unit { get; set; }
+
+//    /// <summary>
+//    /// 图片
+//    /// </summary>
+//    public string ImageUrl { get; set; }
+//}
--- a/Src/Dlhis.Canteen/Order/Response/OrderResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderResponse.cs
@@ -1,5 +0,0 @@
-namespace Dlhis.Canteen.Order.Response;
-
-public class OrderResponse
-{
-}