fix 快速接口失效
This commit is contained in:
@@ -25,7 +25,7 @@ public class OAuth2Controller : ControllerBase
|
|||||||
public async Task<object> ClientGrant(ClientGrantRequest request)
|
public async Task<object> ClientGrant(ClientGrantRequest request)
|
||||||
{
|
{
|
||||||
var authority = _configuration.GetSection("Authority").Value;
|
var authority = _configuration.GetSection("Authority").Value;
|
||||||
var httpClient = _httpClientFactory.CreateClient();
|
var httpClient = _httpClientFactory.CreateClient("face");
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -60,8 +60,8 @@ public class OrderService : IOrderService
|
|||||||
|
|
||||||
//根据档案号
|
//根据档案号
|
||||||
var gainfo = await _dbContext.Queryable<LocalGainfoEntity>()
|
var gainfo = await _dbContext.Queryable<LocalGainfoEntity>()
|
||||||
.Where(x => x.Code == request.UserUniqueNo || x.CardNo == request.UserUniqueNo)
|
.Where(x => x.Code == request.UserUniqueNo)
|
||||||
.FirstAsync();
|
.SingleAsync();
|
||||||
|
|
||||||
var message = "离线消费:";
|
var message = "离线消费:";
|
||||||
|
|
||||||
@@ -70,9 +70,7 @@ public class OrderService : IOrderService
|
|||||||
var isError = false;
|
var isError = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
(await _dbContext.Queryable<LocalGainfoMealEntity>().Where(x => x.UserNo == gainfo.No).AnyAsync())
|
(await _dbContext.Queryable<LocalGainfoMealEntity>().Where(x => x.UserNo == gainfo.No).AnyAsync()).ThrowIfFalse("余额不足,无法消费");
|
||||||
.ThrowIfFalse("余额不足,无法消费");
|
|
||||||
|
|
||||||
await ConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo);
|
await ConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -81,19 +79,18 @@ public class OrderService : IOrderService
|
|||||||
isError = true;
|
isError = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//获取人员余额
|
//获取人员余额
|
||||||
var data = await _dbContext.Queryable<LocalGainfoEntity>()
|
var data = await _dbContext.Queryable<LocalGainfoMealEntity>()
|
||||||
.LeftJoin<LocalDepartmentEntity>((ga, department) => ga.DepartmentNo == department.No)
|
.LeftJoin<LocalGainfoEntity>((x, ga) => x.UserNo == ga.No)
|
||||||
.LeftJoin<LocalGainfoMealEntity>((ga, department, mealUser) => ga.No == mealUser.UserNo)
|
.LeftJoin<LocalDepartmentEntity>((x, ga, department) => ga.DepartmentNo == department.No)
|
||||||
.Where(ga => ga.Id == gainfo.Id)
|
.Where(x => x.UserNo == gainfo.No)
|
||||||
.Select((ga, department, mealUser) => new OrderResultResponse
|
.Select((x, ga, department) => new OrderResultResponse
|
||||||
{
|
{
|
||||||
UserCode = ga.Code,
|
UserCode = ga.Code,
|
||||||
UserName = ga.Name,
|
UserName = ga.Name,
|
||||||
DepartmentNo = ga.DepartmentNo,
|
DepartmentNo = ga.DepartmentNo,
|
||||||
DepartmentName = department.Name,
|
DepartmentName = department.Name,
|
||||||
Balance = mealUser.Balance
|
Balance = x.Balance
|
||||||
})
|
})
|
||||||
.SingleAsync();
|
.SingleAsync();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user