diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index dedd2a4e..baa80576 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -58,13 +58,33 @@ public class OrderService : IOrderService [IgnoreTenant] public async Task AddAsync(OrderAddRequest request) { - //尝试匹配userId - _ = long.TryParse(request.UserUniqueNo, out var userId); - - //根据档案号 + var card = string.Empty; + long userId = 0; + if (request.Source == BalanceRecordSourceEnumType.Card) + { + card = request.UserUniqueNo; + } + else + { + _ = long.TryParse(request.UserUniqueNo, out userId); + } var gainfo = await _dbContext.Queryable() - .Where(x => x.No == request.UserUniqueNo || x.Code == request.UserUniqueNo || x.Id == userId) - .FirstAsync(); + .Where(x => x.No == request.UserUniqueNo || x.Code == request.UserUniqueNo || x.Id == userId|| x.CardNo == card) + .FirstAsync(); + + + // .... + { + ////尝试匹配userId + //_ = long.TryParse(request.UserUniqueNo, out var userId); + + ////根据档案号 + //var gainfo = await _dbContext.Queryable() + // .Where(x => x.No == request.UserUniqueNo || x.Code == request.UserUniqueNo || x.Id == userId) + // .FirstAsync(); + } + + gainfo.ThrowIfNull($"用户{request.UserUniqueNo}不存在,无法操作"); var canteenUserExists = await _dbContext.Queryable() diff --git a/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs b/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs index b2c442aa..06d16288 100644 --- a/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs +++ b/Src/Dlhis.Common/FileOperation/Controllers/ApkFileController.cs @@ -29,6 +29,8 @@ public class ApkFileController : ControllerBase /// /// [HttpPost("minlo")] + [DisableRequestSizeLimit] + [RequestSizeLimit(300000000)] public async Task FormSingleFileUpload([FromForm] ApkRequest request) { return await _apkFIileService.FormSingleFileUpload(request);