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

fix 补充过程log

Browse Source
This commit is contained in:
liguoyang
2024-07-20 13:43:07 +08:00
parent 60a8ad695f
commit a981baa296
4 changed files with 93 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
View File

@@ -42,13 +42,25 @@ public class OrdersController : ControllerBase
public async Task<DefaultApiResult<OrderResultResponse>> AddAsync(OrderAddRequest request)
{
var sw = Stopwatch.StartNew();
var result = await _orderService.AddAsync(request);
try
{
return await _orderService.AddAsync(request);
return result.Response;
}
finally
{
_logger.LogInformation("消费请求:{json}. 耗时:{time}", request.ToJson(), sw.ElapsedMilliseconds);
var ms = sw.ElapsedMilliseconds;
try
{
if (ms > 1000)
{
_logger.LogInformation("消费请求:{json}. 耗时记录:{log}", request.ToJson(), result.Logs.Join("\r\n"));
}
}
catch (Exception e)
{
//ignore
}
}
}
@@ -62,7 +74,27 @@ public class OrdersController : ControllerBase
[IgnoreTenant]
public async Task<DefaultApiResult<OrderResultResponse>> DeviceConsume(OrderAddRequest request)
{
return await _orderService.AddAsync(request);
var sw = Stopwatch.StartNew();
var result = await _orderService.AddAsync(request);
try
{
return result.Response;
}
finally
{
var ms = sw.ElapsedMilliseconds;
try
{
if (ms > 1000)
{
_logger.LogInformation("消费请求:{json}. 耗时记录:{log}", request.ToJson(), result.Logs.Join("\r\n"));
}
}
catch (Exception e)
{
//ignore
}
}
}
/// <summary>

10
Src/Dlhis.Canteen/Order/Response/OrderResultResponseWithLogs.cs Normal file
View File

@@ -0,0 +1,10 @@
using Kurisu.AspNetCore.UnifyResultAndValidation;
namespace Dlhis.Canteen.Order.Response;
public class OrderResultResponseWithLogs
{
public DefaultApiResult<OrderResultResponse> Response { get; set; }
public List<string> Logs { get; set; } = new();
}

5
Src/Dlhis.Canteen/Order/Services/IOrderService.cs
View File

@@ -1,20 +1,19 @@
using Dlhis.Canteen.Order.Request;
using Dlhis.Canteen.Order.Response;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.UnifyResultAndValidation;
namespace Dlhis.Canteen.Order.Services;
public interface IOrderService : IScopeDependency
{
Task<DefaultApiResult<OrderResultResponse>> AddAsync(OrderAddRequest request);
Task<OrderResultResponseWithLogs> AddAsync(OrderAddRequest request);
/// <summary>
/// 设备消费
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
Task<DefaultApiResult<OrderResultResponse>> DeviceConsume(OrderAddRequest request);
Task<OrderResultResponseWithLogs> DeviceConsume(OrderAddRequest request);
Task<Pagination<OrderAggregationResponse>> GetOrdersAggregationAsync(PageDto page);
}

64
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -1,4 +1,5 @@
using Dlhis.Canteen.Setting.Services;
using System.Diagnostics;
using Dlhis.Canteen.Setting.Services;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
@@ -22,6 +23,8 @@ namespace Dlhis.Canteen.Order.Services.Implements;
public class OrderService : BaseOrderService, IOrderService
{
private readonly IServiceProvider _serviceProvider;
private Stopwatch _sw;
private readonly List<string> _logs = new();
public OrderService(ICanteenSettingService canteenSettingService,
IDbContext dbContext,
@@ -33,14 +36,16 @@ public class OrderService : BaseOrderService, IOrderService
_serviceProvider = serviceProvider;
}
public async Task<DefaultApiResult<OrderResultResponse>> DeviceConsume(OrderAddRequest request)
public async Task<OrderResultResponseWithLogs> DeviceConsume(OrderAddRequest request)
{
return await AddAsync(request);
}
public async Task<DefaultApiResult<OrderResultResponse>> AddAsync(OrderAddRequest request)
public async Task<OrderResultResponseWithLogs> AddAsync(OrderAddRequest request)
{
_sw = new Stopwatch();
//尝试匹配userId
var s = long.TryParse(request.UserUniqueNo, out var userId);
@@ -60,6 +65,9 @@ public class OrderService : BaseOrderService, IOrderService
.FirstAsync();
}
_logs.Add("获取人员耗时:" + _sw.ElapsedMilliseconds);
_sw.Restart();
var message = string.Empty;
if (request.IsOffline)
@@ -126,12 +134,21 @@ public class OrderService : BaseOrderService, IOrderService
})
.SingleAsync();
return new DefaultApiResult<OrderResultResponse>
var result = new DefaultApiResult<OrderResultResponse>
{
Code = message.IsPresent() ? ApiStateCode.Error : ApiStateCode.Success,
Data = data,
Msg = message
};
_logs.Add("获取余额:" + _sw.ElapsedMilliseconds);
_sw.Restart();
return new OrderResultResponseWithLogs
{
Response = result,
Logs = _logs
};
}
private async Task<bool> ToCheckAsync(string thirdNo)
@@ -309,6 +326,9 @@ public class OrderService : BaseOrderService, IOrderService
}.IsPresent1(request.CostDateTime));
shift.ThrowIfNull("非就餐时间,无法消费");
_logs.Add("检验设备和营业点参数:" + _sw.ElapsedMilliseconds);
_sw.Restart();
var costDate = await GetCostDateAsync(shift, request.CostDateTime);
var order = new CanteenOrderEntity
@@ -350,9 +370,13 @@ public class OrderService : BaseOrderService, IOrderService
};
var orderId = await DbContext.InsertReturnIdentityAsync(order);
_logs.Add("临时order写入:" + _sw.ElapsedMilliseconds);
_sw.Restart();
try
{
await GenerateConsumeRecordAsync(orderId);
if (request.Image.IsPresent())
{
await DbContext.InsertAsync(new ImageRecordEntity
@@ -368,6 +392,9 @@ public class OrderService : BaseOrderService, IOrderService
.SetColumns(x => x.ModifiedTime == DateTime.Now)
.Where(x => x.Id == orderId)
.ExecuteCommandAsync();
_logs.Add("更新image和订单信息:" + _sw.ElapsedMilliseconds);
_sw.Restart();
}
catch (Exception ex)
{
@@ -534,30 +561,31 @@ public class OrderService : BaseOrderService, IOrderService
var order = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).SingleAsync();
//校验
await Verify(order);
_logs.Add("消费请求校验:" + _sw.ElapsedMilliseconds);
_sw.Restart();
var allowNoBalance = await GetSettingAsync<bool>(order.UserNo, order.TenantId, CanteenSettingItemEnumType.AllowNoBalance);
await CommonHelper.RetryAsync(async () =>
{
if (!allowNoBalance)
{
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).SingleAsync();
//金额+-
gainfoMeal.Balance += order.Amount;
(gainfoMeal.Balance < 0).ThrowIfTrue("余额不足,无法消费");
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).SingleAsync();
//金额+-
gainfoMeal.Balance += order.Amount;
(gainfoMeal.Balance < 0).ThrowIfTrue("余额不足,无法消费");
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();
}
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();
//写入记录
var balanceRecord = order.Adapt<BalanceRecordEntity>();
await DbContext.InsertAsync(balanceRecord);
}, 5);
_logs.Add("消费写入:" + _sw.ElapsedMilliseconds);
_sw.Restart();
}
/// <summary>