fix 重新核算离线数据

This commit is contained in:
2024-04-09 17:02:10 +08:00
parent 1beb64df63
commit 8874808a2a
4 changed files with 78 additions and 0 deletions

View File

@@ -39,6 +39,13 @@ public class OrdersController : ControllerBase
return await _orderService.AddAsync(request);
}
[IgnoreTenant]
[HttpPost("ReCalcOffline")]
public async Task ReCalcOfflineAsync(ReCalcOfflineRequest request)
{
await _orderService.ReCalcOfflineAsync(request);
}
/// <summary>
/// 设备发起订单
/// </summary>

View File

@@ -0,0 +1,10 @@
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Canteen.Order.Request
{
public class ReCalcOfflineRequest
{
[Required]
public string UserCode { get; set; }
}
}

View File

@@ -10,6 +10,9 @@ public interface IOrderService : IScopeDependency
Task<DefaultApiResult<OrderResultResponse>> AddAsync(OrderAddRequest request);
Task ReCalcOfflineAsync(ReCalcOfflineRequest request);
/// <summary>
/// 设备消费
/// </summary>

View File

@@ -675,5 +675,63 @@ public class OrderService : BaseOrderService, IOrderService
}, 5);
}
public async Task ReCalcOfflineAsync(ReCalcOfflineRequest request)
{
var gainfo = await DbContext.Queryable<GainfoEntity>().Where(x => x.Code == request.UserCode).FirstAsync();
var nos = await DbContext.Queryable<BalanceRecordEntity>().Where(x => x.UserCode == request.UserCode).Select(x => x.No).ToListAsync();
var orders = await DbContext.Queryable<CanteenOrderEntity>().Where(x => x.IsOffline)
.Where(x => nos.Contains(x.No))
.Where(x => x.UserCode == request.UserCode)
.ToListAsync();
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == gainfo.No).FirstAsync();
if (gainfoMeal == null)
{
gainfoMeal = new GainfoMealEntity
{
Balance = 0,
BalanceOfRecharge = 0,
BalanceOfSubsidies = 0,
Version = 0,
TenantId = gainfo.Factory,
UserNo = gainfo.No,
UserCode = gainfo.Code,
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
};
await DbContext.InsertAsync(gainfoMeal);
}
var allowNoBalance = await GetSettingAsync<bool>(CanteenSettingItemEnumType.AllowNoBalance);
foreach (var order in orders)
{
await CommonHelper.RetryAsync(async () =>
{
if (!allowNoBalance)
{
var gainfoMeal = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
//金额+-
gainfoMeal.Balance += order.Amount;
await DbContext.Updateable<GainfoMealEntity>()
.SetColumns(x => x.Balance == gainfoMeal.Balance)
.SetColumns(x => x.Version == x.Version + 1)
.Where(x => x.UserNo == order.UserNo && x.Version == gainfoMeal.Version)//必须与查询时的version一致
.ExecuteCommandThrowVersionAsync();
}
//写入记录
var balanceRecord = order.Adapt<BalanceRecordEntity>();
balanceRecord.Id = 0;
await DbContext.InsertAsync(balanceRecord);
}, 5);
}
}
}