diff --git a/Src/Dlhis.Middle/Controllers/OAuth2Controller.cs b/Src/Dlhis.Middle/Controllers/OAuth2Controller.cs index 4ee6f3e7..38170835 100644 --- a/Src/Dlhis.Middle/Controllers/OAuth2Controller.cs +++ b/Src/Dlhis.Middle/Controllers/OAuth2Controller.cs @@ -25,7 +25,7 @@ public class OAuth2Controller : ControllerBase public async Task ClientGrant(ClientGrantRequest request) { var authority = _configuration.GetSection("Authority").Value; - var httpClient = _httpClientFactory.CreateClient(); + var httpClient = _httpClientFactory.CreateClient("face"); try { diff --git a/Src/Dlhis.Middle/Services/Implements/OrderService.cs b/Src/Dlhis.Middle/Services/Implements/OrderService.cs index a632b1c5..18a2a629 100644 --- a/Src/Dlhis.Middle/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Middle/Services/Implements/OrderService.cs @@ -60,8 +60,8 @@ public class OrderService : IOrderService //根据档案号 var gainfo = await _dbContext.Queryable() - .Where(x => x.Code == request.UserUniqueNo || x.CardNo == request.UserUniqueNo) - .FirstAsync(); + .Where(x => x.Code == request.UserUniqueNo) + .SingleAsync(); var message = "离线消费:"; @@ -70,9 +70,7 @@ public class OrderService : IOrderService var isError = false; try { - (await _dbContext.Queryable().Where(x => x.UserNo == gainfo.No).AnyAsync()) - .ThrowIfFalse("余额不足,无法消费"); - + (await _dbContext.Queryable().Where(x => x.UserNo == gainfo.No).AnyAsync()).ThrowIfFalse("余额不足,无法消费"); await ConsumeAsync(request.Adapt(), gainfo); } catch (Exception ex) @@ -81,19 +79,18 @@ public class OrderService : IOrderService isError = true; } - //获取人员余额 - var data = await _dbContext.Queryable() - .LeftJoin((ga, department) => ga.DepartmentNo == department.No) - .LeftJoin((ga, department, mealUser) => ga.No == mealUser.UserNo) - .Where(ga => ga.Id == gainfo.Id) - .Select((ga, department, mealUser) => new OrderResultResponse + var data = await _dbContext.Queryable() + .LeftJoin((x, ga) => x.UserNo == ga.No) + .LeftJoin((x, ga, department) => ga.DepartmentNo == department.No) + .Where(x => x.UserNo == gainfo.No) + .Select((x, ga, department) => new OrderResultResponse { UserCode = ga.Code, UserName = ga.Name, DepartmentNo = ga.DepartmentNo, DepartmentName = department.Name, - Balance = mealUser.Balance + Balance = x.Balance }) .SingleAsync();