feat 外包人员,框架升级

Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs

@@ -7,18 +7,16 @@ using Dlhis.Entity.Canteen.Enums;
 using Dlhis.Entity.Device.Entities;
 using Kurisu.AspNetCore.Utils;
 using Kurisu.AspNetCore.Utils.Extensions;
-using Kurisu.Core.CustomClass;
-using Kurisu.Core.DataAccess.Dto;
-using Kurisu.Core.User.Abstractions;
-using Kurisu.SqlSugar.Extensions;
-using Kurisu.SqlSugar.Services;
 using Mapster;
 using SqlSugar;
 using Dlhis.Canteen.Order.Response;
-using Dlhis.Canteen.Dishes;
 using Dlhis.Canteen.Order.Request;
-using Kurisu.Core.Result;
-using Org.BouncyCastle.Asn1.Ocsp;
+using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.CustomClass;
+using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
+using Kurisu.AspNetCore.UnifyResultAndValidation;
 
 namespace Dlhis.Canteen.Order.Services.Implements;
 
@@ -108,18 +106,18 @@ public class OrderService : BaseOrderService, IOrderService
 
         //获取人员余额
         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)
-                   .Select((ga, department, mealUser) => new OrderResultResponse
-                   {
-                       UserCode = ga.Code,
-                       UserName = ga.Name,
-                       DepartmentNo = ga.DepartmentNo,
-                       DepartmentName = department.Name,
-                       CurrentBalance = mealUser.Balance
-                   })
-                   .SingleAsync();
+            .LeftJoin<DepartmentEntity>((ga, department) => ga.DepartmentNo == department.No)
+            .LeftJoin<GainfoMealEntity>((ga, department, mealUser) => ga.No == mealUser.UserNo)
+            .Where(ga => ga.Id == gainfo.Id)
+            .Select((ga, department, mealUser) => new OrderResultResponse
+            {
+                UserCode = ga.Code,
+                UserName = ga.Name,
+                DepartmentNo = ga.DepartmentNo,
+                DepartmentName = department.Name,
+                CurrentBalance = mealUser.Balance
+            })
+            .SingleAsync();
 
         return new DefaultApiResult<OrderResultResponse>
         {
@@ -132,9 +130,9 @@ public class OrderService : BaseOrderService, IOrderService
     private async Task<bool> ToCheckAsync(string thirdNo)
     {
         var order = await DbContext.Queryable<CanteenOrderEntity>()
-               .Where(x => x.ThirdNo == thirdNo)
-               .OrderBy(x => x.CreateTime, OrderByType.Desc)
-               .FirstAsync();
+            .Where(x => x.ThirdNo == thirdNo)
+            .OrderBy(x => x.CreateTime, OrderByType.Desc)
+            .FirstAsync();
 
         if (order == null)
         {
@@ -152,10 +150,6 @@ public class OrderService : BaseOrderService, IOrderService
 
     private async Task HandleOfflineAsync(ConsumeRequest request, GainfoEntity gainfo)
     {
-        var device = await DbContext.Queryable<DeviceEntity>()
-            .Where(x => x.UniqueNo == request.DeviceUniqueNo)
-            .FirstAsync();
-
         var registry = await DbContext.Queryable<DeviceRegistryEntity>()
             .Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo)
             .FirstAsync();
@@ -179,7 +173,6 @@ public class OrderService : BaseOrderService, IOrderService
         {
             Start = x.Start,
             End = x.End
-
         }.IsPresent1(request.CostDateTime));
 
         var costDate = await GetCostDateAsync(shift, request.CostDateTime);
@@ -263,17 +256,16 @@ public class OrderService : BaseOrderService, IOrderService
                 gainfoMeal.Balance += order.Amount;
 
                 await DbContext.Updateable<GainfoMealEntity>()
-                            .SetColumns(x => x.Balance == gainfoMeal.Balance)
-                            .SetColumns(x => x.Version == x.Version + 1)
-                            .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                            .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version)//必须与查询时的version一致
-                            .ExecuteCommandThrowVersionAsync();
+                    .SetColumns(x => x.Balance == gainfoMeal.Balance)
+                    .SetColumns(x => x.Version == x.Version + 1)
+                    .SetColumns(x => x.ModifiedTime == DateTime.Now)
+                    .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version) //必须与查询时的version一致
+                    .ExecuteCommandThrowVersionAsync();
             }
 
             //写入记录
             var balanceRecord = order.Adapt<BalanceRecordEntity>();
             await DbContext.InsertAsync(balanceRecord);
-
         }, 5);
     }
 
@@ -312,7 +304,6 @@ public class OrderService : BaseOrderService, IOrderService
         {
             Start = x.Start,
             End = x.End
-
         }.IsPresent1(request.CostDateTime));
         shift.ThrowIfNull("非就餐时间,无法消费");
 
@@ -374,10 +365,10 @@ public class OrderService : BaseOrderService, IOrderService
         }
 
         await DbContext.Updateable<CanteenOrderEntity>()
-              .SetColumns(x => x.OrderStatus == CanteenOrderStatusEnumType.Success)
-              .SetColumns(x => x.ModifiedTime == DateTime.Now)
-              .Where(x => x.Id == orderId)
-              .ExecuteCommandAsync();
+            .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)
@@ -391,39 +382,36 @@ public class OrderService : BaseOrderService, IOrderService
         }
 
         var pageResult = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.UserNo == gainfo.No)
-                .LeftJoin<BusinessPlaceEntity>((x, bplace) => x.BusinessPlaceCode == bplace.Code)
-                .Where(x => x.ApplicationType == CanteenApplicaitonTypeEnumType.Booking)
-                .OrderBy(x => x.CreateTime, OrderByType.Desc)
-                .Select((x, bplace) => new OrderAggregationResponse
-                {
-                    No = x.No,
-                    BusinessPlaceName = bplace.Name,
-                    CreateTime = x.CreateTime,
-                    Remark = x.Remark,
-                    OrderStatus = x.OrderStatus,
-                })
-                .ToPageListAsync(page);
+            .LeftJoin<BusinessPlaceEntity>((x, bplace) => x.BusinessPlaceCode == bplace.Code)
+            .Where(x => x.ApplicationType == CanteenApplicaitonTypeEnumType.Booking)
+            .OrderBy(x => x.CreateTime, OrderByType.Desc)
+            .Select((x, bplace) => new OrderAggregationResponse
+            {
+                No = x.No,
+                BusinessPlaceName = bplace.Name,
+                CreateTime = x.CreateTime,
+                Remark = x.Remark,
+                OrderStatus = x.OrderStatus,
+            })
+            .ToPageListAsync(page);
 
         var nos = pageResult.Data.Select(x => x.No).ToList();
         var dtos = await DbContext.Queryable<CanteenOrderDetailEntity>()
-                .LeftJoin<DishesEntity>((x, d) => x.DishesCode == d.CustomCode)
-                .Where(x => nos.Contains(x.OrderNo))
-                .Select((x, d) => new DishesDto
-                {
-                    No = x.OrderNo,
-                    DishesCode = x.DishesCode,
-                    Name = d.Name,
-                    ImageUrl = d.ImageUrl,
-                    Number = x.Number,
-                    Price = x.Price,
-                })
-                .ToListAsync();
+            .LeftJoin<DishesEntity>((x, d) => x.DishesCode == d.CustomCode)
+            .Where(x => nos.Contains(x.OrderNo))
+            .Select((x, d) => new DishesDto
+            {
+                No = x.OrderNo,
+                DishesCode = x.DishesCode,
+                Name = d.Name,
+                ImageUrl = d.ImageUrl,
+                Number = x.Number,
+                Price = x.Price,
+            })
+            .ToListAsync();
 
 
-        pageResult.Data.ForEach(item =>
-        {
-            item.Dishes = dtos.Where(x => x.No == item.No).ToList();
-        });
+        pageResult.Data.ForEach(item => { item.Dishes = dtos.Where(x => x.No == item.No).ToList(); });
 
         return pageResult;
     }
@@ -432,19 +420,19 @@ public class OrderService : BaseOrderService, IOrderService
     public async Task UpdateOffline(UpdateOfflineRequest outRequest)
     {
         var orders = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.IsOffline)
-              .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
-              .Where(x => x.OrderStatus == CanteenOrderStatusEnumType.Success)
-              .Where(x => x.ApplicationType == CanteenApplicaitonTypeEnumType.Device)
-              .Where(x => SqlFunc.IsNullOrEmpty(x.BusinessShiftCode))
-              .WhereIF(outRequest.No.IsPresent(), x => x.No == outRequest.No)
-              .ToListAsync();
+            .Where(x => x.Status == BalanceRecordStatusEnumType.Valid)
+            .Where(x => x.OrderStatus == CanteenOrderStatusEnumType.Success)
+            .Where(x => x.ApplicationType == CanteenApplicaitonTypeEnumType.Device)
+            .Where(x => SqlFunc.IsNullOrEmpty(x.BusinessShiftCode))
+            .WhereIF(outRequest.No.IsPresent(), x => x.No == outRequest.No)
+            .ToListAsync();
 
         foreach (var item in orders)
         {
             var request = item.RequestJson.ToObject<ConsumeRequest>();
             var device = await DbContext.Queryable<DeviceEntity>()
-            .Where(x => x.UniqueNo == request.DeviceUniqueNo)
-            .FirstAsync();
+                .Where(x => x.UniqueNo == request.DeviceUniqueNo)
+                .FirstAsync();
 
             var registry = await DbContext.Queryable<DeviceRegistryEntity>()
                 .Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo)
@@ -469,7 +457,6 @@ public class OrderService : BaseOrderService, IOrderService
             {
                 Start = x.Start,
                 End = x.End
-
             }.IsPresent1(request.CostDateTime));
 
             var costDate = await GetCostDateAsync(shift, request.CostDateTime);
@@ -521,7 +508,6 @@ public class OrderService : BaseOrderService, IOrderService
     }
 
 
-
     /// <summary>
     /// 验证参数
     /// </summary>
@@ -543,9 +529,9 @@ public class OrderService : BaseOrderService, IOrderService
 
         //超市营业点
         var supermarketCodes = await DbContext.Queryable<BusinessPlaceEntity>()
-                              .Where(x => x.Catalog == CanteenBusinessPlaceCatalogEnumType.Supermarket)
-                              .Select(x => x.Code)
-                              .ToListAsync();
+            .Where(x => x.Catalog == CanteenBusinessPlaceCatalogEnumType.Supermarket)
+            .Select(x => x.Code)
+            .ToListAsync();
 
         //一天消费金额
         var dayCostMax = await GetSettingAsync<decimal>(order.TenantId, CanteenSettingItemEnumType.DayCostMax);
@@ -618,17 +604,16 @@ public class OrderService : BaseOrderService, IOrderService
                 }
 
                 await DbContext.Updateable<GainfoMealEntity>()
-                            .SetColumns(x => x.Balance == gainfoMeal.Balance)
-                            .SetColumns(x => x.Version == x.Version + 1)
-                            .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                            .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version)//必须与查询时的version一致
-                            .ExecuteCommandThrowVersionAsync();
+                    .SetColumns(x => x.Balance == gainfoMeal.Balance)
+                    .SetColumns(x => x.Version == x.Version + 1)
+                    .SetColumns(x => x.ModifiedTime == DateTime.Now)
+                    .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version) //必须与查询时的version一致
+                    .ExecuteCommandThrowVersionAsync();
             }
 
             //写入记录
             var balanceRecord = order.Adapt<BalanceRecordEntity>();
             await DbContext.InsertAsync(balanceRecord);
-
         }, 5);
     }
 
@@ -638,10 +623,10 @@ public class OrderService : BaseOrderService, IOrderService
         var nos = await DbContext.Queryable<BalanceRecordEntity>().Where(x => x.UserCode == request.UserCode).Select(x => x.No).ToListAsync();
 
         var orders = await DbContext.Queryable<CanteenOrderEntity>()
-              .Where(x => x.IsOffline)
-              .Where(x => !nos.Contains(x.No))
-              .Where(x => x.UserCode == request.UserCode)
-        .ToListAsync();
+            .Where(x => x.IsOffline)
+            .Where(x => !nos.Contains(x.No))
+            .Where(x => x.UserCode == request.UserCode)
+            .ToListAsync();
 
 
         var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == gainfo.No).FirstAsync();
@@ -674,17 +659,16 @@ public class OrderService : BaseOrderService, IOrderService
                 gainfoMeal.Balance += order.Amount;
 
                 await DbContext.Updateable<GainfoMealEntity>()
-                            .SetColumns(x => x.Balance == gainfoMeal.Balance)
-                            .SetColumns(x => x.Version == x.Version + 1)
-                            .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                            .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version)//必须与查询时的version一致
-                            .ExecuteCommandThrowVersionAsync();
+                    .SetColumns(x => x.Balance == gainfoMeal.Balance)
+                    .SetColumns(x => x.Version == x.Version + 1)
+                    .SetColumns(x => x.ModifiedTime == DateTime.Now)
+                    .Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version) //必须与查询时的version一致
+                    .ExecuteCommandThrowVersionAsync();
                 //写入记录
                 var balanceRecord = order.Adapt<BalanceRecordEntity>();
                 balanceRecord.Id = 0;
                 await DbContext.InsertAsync(balanceRecord);
-
             }, 5);
         }
     }
-}
+}