yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 快速接口失效

Browse Source
This commit is contained in:
liguoyang
2024-08-20 15:08:01 +08:00
parent c9af919139
commit 7d035b8544
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Middle/Controllers/OAuth2Controller.cs
View File

@@ -25,7 +25,7 @@ public class OAuth2Controller : ControllerBase
public async Task<object> ClientGrant(ClientGrantRequest request)
{
var authority = _configuration.GetSection("Authority").Value;
var httpClient = _httpClientFactory.CreateClient();
var httpClient = _httpClientFactory.CreateClient("face");
try
{

21
Src/Dlhis.Middle/Services/Implements/OrderService.cs
View File

@@ -60,8 +60,8 @@ public class OrderService : IOrderService
//根据档案号
var gainfo = await _dbContext.Queryable<LocalGainfoEntity>()
.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<LocalGainfoMealEntity>().Where(x => x.UserNo == gainfo.No).AnyAsync())
.ThrowIfFalse("余额不足,无法消费");
(await _dbContext.Queryable<LocalGainfoMealEntity>().Where(x => x.UserNo == gainfo.No).AnyAsync()).ThrowIfFalse("余额不足,无法消费");
await ConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo);
}
catch (Exception ex)
@@ -81,19 +79,18 @@ public class OrderService : IOrderService
isError = true;
}
//获取人员余额
var data = await _dbContext.Queryable<LocalGainfoEntity>()
.LeftJoin<LocalDepartmentEntity>((ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<LocalGainfoMealEntity>((ga, department, mealUser) => ga.No == mealUser.UserNo)
.Where(ga => ga.Id == gainfo.Id)
.Select((ga, department, mealUser) => new OrderResultResponse
var data = await _dbContext.Queryable<LocalGainfoMealEntity>()
.LeftJoin<LocalGainfoEntity>((x, ga) => x.UserNo == ga.No)
.LeftJoin<LocalDepartmentEntity>((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();