fix 调整tenantId为空引起上传失败

This commit is contained in:
2024-12-17 14:10:07 +08:00
parent b7fa470fc3
commit 7a3c5ec2f8
4 changed files with 13 additions and 130 deletions

View File

@@ -10,7 +10,6 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
{
private readonly IServiceProvider _serviceProvider;
private readonly ILogger<BalanceRecordUploadBackgroundService> _logger;
private readonly IWebHostEnvironment _environment;
private readonly ISettingService _settingService;
private readonly ICanteenApi _canteenApi;
@@ -18,14 +17,12 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
public BalanceRecordUploadBackgroundService(IServiceProvider serviceProvider,
ILogger<BalanceRecordUploadBackgroundService> logger,
IWebHostEnvironment environment,
ISettingService settingService,
ICanteenApi canteenApi,
IHealthCheckService healthCheckService)
{
_serviceProvider = serviceProvider;
_logger = logger;
_environment = environment;
_settingService = settingService;
_canteenApi = canteenApi;
_healthCheckService = healthCheckService;
@@ -33,7 +30,7 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
while (!stoppingToken.IsCancellationRequested && _environment.IsProduction())
while (!stoppingToken.IsCancellationRequested)
{
if (!_healthCheckService.GetIsOffline())
{
@@ -48,7 +45,10 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
{
try
{
var balanceRecords = await db.Queryable<LocalBalanceRecordEntity>().Where(x => x.TenantId == factory).Where(x => !x.IsSync).ToListAsync(stoppingToken);
var balanceRecords = await db.Queryable<LocalBalanceRecordEntity>()
.Where(x => x.TenantId == factory)
.Where(x => !x.IsSync).ToListAsync(stoppingToken);
if (balanceRecords.Any())
{
_logger.LogInformation("上传离线订单");
@@ -87,9 +87,13 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
balanceRecords = await db.Queryable<LocalBalanceRecordEntity>().Where(x => x.TenantId == factory).Where(x => !x.IsSync).ToListAsync(stoppingToken);
if (!balanceRecords.Any())
{
_logger.LogInformation("上传离线订单完成");
_logger.LogInformation("{factory}上传离线订单完成", factory);
}
}
else
{
_logger.LogInformation("{factory}无离线订单", factory);
}
}
catch (Exception e)
{
@@ -125,7 +129,7 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
}
}
await Task.Delay(60 * 1000, stoppingToken);
await Task.Delay(30 * 1000, stoppingToken);
}
}
}