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-01-12 16:18:44 +08:00
parent 74137c9f44
commit cb2562c8b8
10 changed files with 363 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,12 +34,12 @@ public class OrdersController : ControllerBase
}
/// <summary>
/// 添加充值消费订单
/// 添加充值/消费订单
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public async Task<OrderConsumeResponse> AddAsync(OrderAddRequest request)
public async Task<OrderResultResponse> AddAsync(OrderAddRequest request)
{
return await _orderService.AddAsync(request);
}

41
Src/Dlhis.Canteen/Order/Request/ConsumeRequest.cs Normal file
View File

@@ -0,0 +1,41 @@
using Dlhis.Entity.Canteen.Enums;
namespace Dlhis.Canteen.Order.Request;
public class ConsumeRequest
{
/// <summary>
/// 是否离线数据
/// </summary>
public bool IsOffline { get; set; }
/// <summary>
/// 消费机器唯一信息
/// </summary>
public string DeviceUniqueNo { get; set; }
/// <summary>
/// 第三方订单号
/// </summary>
public string ThirdNo { get; set; }
/// <summary>
/// 档案号/QrCode/学工号
/// </summary>
public string UserUniqueNo { get; set; }
/// <summary>
/// 来源
/// </summary>
public BalanceRecordSourceEnumType Source { get; set; }
/// <summary>
/// 金额
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 产生时间
/// </summary>
public DateTime CostDateTime { get; set; }
}

42
Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs
View File

@@ -1,9 +1,10 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Canteen.Order.Request;
public class OrderAddRequest
public class OrderAddRequest : IValidatableObject
{
/// <summary>
/// 是否离线数据
@@ -23,6 +24,7 @@ public class OrderAddRequest
/// <summary>
/// 档案号/QrCode/学工号
/// </summary>
[Required(ErrorMessage = "人员档案号/QrCode/学工号不能为空")]
public string UserUniqueNo { get; set; }
/// <summary>
@@ -44,7 +46,41 @@ public class OrderAddRequest
public decimal Amount { get; set; }
/// <summary>
/// 消费时间,由机器提供,否则获取当前时间
/// 产生时间
/// </summary>
public DateTime CostDateTime { get; set; } = DateTime.Now;
public DateTime? CostDateTime { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
//处理金额
Amount = Type == BalanceRecordTypeEnumType.In ? Math.Abs(Amount) : -Math.Abs(Amount);
if (Type == BalanceRecordTypeEnumType.Out)
{
//处理消费类型
if ((int)Source >= (int)BalanceRecordSourceEnumType.Wechat)
{
yield return new ValidationResult($"不支持来源{Source.GetDescription()}", new[] { nameof(Source) });
}
//在线就以API时间为准
if (!IsOffline)
{
CostDateTime = DateTime.Now;
}
if (DeviceUniqueNo.IsEmpty())
{
yield return new ValidationResult("设备唯一号不能为空", new[] { nameof(DeviceUniqueNo) });
}
}
else if (Type == BalanceRecordTypeEnumType.In)
{
if ((int)Source < (int)BalanceRecordSourceEnumType.Wechat)
{
yield return new ValidationResult($"不支持来源{Source.GetDescription()}", new[] { nameof(Source) });
}
}
}
}

34
Src/Dlhis.Canteen/Order/Request/RechargeRequest.cs Normal file
View File

@@ -0,0 +1,34 @@
using Dlhis.Entity.Canteen.Enums;
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Canteen.Order.Request;
public class RechargeRequest
{
/// <summary>
/// 第三方订单号
/// </summary>
public string ThirdNo { get; set; }
/// <summary>
/// 档案号/QrCode/学工号
/// </summary>
public string UserUniqueNo { get; set; }
/// <summary>
/// 来源
/// </summary>
[EnumDataType(typeof(BalanceRecordSourceEnumType))]
public BalanceRecordSourceEnumType Source { get; set; }
/// <summary>
/// 金额
/// </summary>
[Range(0.01, double.MaxValue)]
public decimal Amount { get; set; }
/// <summary>
/// 产生时间
/// </summary>
public DateTime CostDateTime { get; set; } = DateTime.Now;
}

5
Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
View File

@@ -109,4 +109,9 @@ public class BalanceRecordResponse
/// 数据状态描述
/// </summary>
public string StatusDesc => Status.GetDescription();
/// <summary>
/// 记录产生时间
/// </summary>
public DateTime CostDateTime { get; set; }
}

5
Src/Dlhis.Canteen/Order/Response/BalanceRecordUserResponse.cs
View File

@@ -44,4 +44,9 @@ public class BalanceRecordUserResponse
/// 数据状态描述
/// </summary>
public string StatusDesc => Status.GetDescription();
/// <summary>
/// 记录产生日期
/// </summary>
public DateTime CostDateTime { get; set; }
}

2
Src/Dlhis.Canteen/Order/Response/OrderConsumeResponse.cs → Src/Dlhis.Canteen/Order/Response/OrderResultResponse.cs
View File

@@ -1,6 +1,6 @@
namespace Dlhis.Canteen.Order.Response;
public class OrderConsumeResponse
public class OrderResultResponse
{
/// <summary>
/// 用户工号

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

@@ -8,5 +8,5 @@ public interface IOrderService : IScopeDependency
{
Task<Pagination<OrderResponse>> GetPageAsync(OrderPageRequest request);
Task<OrderConsumeResponse> AddAsync(OrderAddRequest request);
Task<OrderResultResponse> AddAsync(OrderAddRequest request);
}

3
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -56,6 +56,7 @@ public class BalanceService : IBalanceService
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessShiftName = bshift.Name,
CostDateTime = record.CreateTime // todo
})
.ToPageListAsync(request);
@@ -121,6 +122,7 @@ public class BalanceService : IBalanceService
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessShiftName = bshift.Name,
CostDateTime = record.CreateTime // todo
})
.ToPageListAsync(request);
@@ -151,6 +153,7 @@ public class BalanceService : IBalanceService
No = record.No,
BusinessPlaceName = bplace.Name,
BusinessShiftName = bshift.Name,
CostDateTime = record.CreateTime // todo
})
.ToPageListAsync(request);

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

@@ -24,7 +24,9 @@ public class OrderService : IOrderService
private readonly ICanteenSettingService _canteenSettingService;
private readonly ILogger<OrderService> _logger;
public OrderService(IDbContext dbContext, ICanteenSettingService canteenSettingService, ILogger<OrderService> logger)
public OrderService(IDbContext dbContext,
ICanteenSettingService canteenSettingService,
ILogger<OrderService> logger)
{
_dbContext = dbContext;
_canteenSettingService = canteenSettingService;
@@ -41,40 +43,73 @@ public class OrderService : IOrderService
}
[IgnoreTenant]
public async Task<OrderConsumeResponse> AddAsync(OrderAddRequest request)
public async Task<OrderResultResponse> AddAsync(OrderAddRequest request)
{
//根据档案号
var canteenUserExists = await _dbContext.Queryable<CanteenUserEntity>()
.Where(x => x.UserNo == request.UserUniqueNo || x.UserCode == request.UserUniqueNo)
.AnyAsync();
canteenUserExists.ThrowIfFalse($"就餐用户{request.UserUniqueNo}不存在,无法操作");
var gainfo = await _dbContext.Queryable<GainfoEntity>()
.Where(x => x.No == request.UserUniqueNo || x.Code == request.UserUniqueNo)
.FirstAsync();
gainfo.ThrowIfNull($"用户{request.UserUniqueNo}不存在,无法操作");
//消费
if (request.Type == BalanceRecordTypeEnumType.Out)
{
await ConsumeAsync(request.Adapt<ConsumeRequest>(), gainfo);
}
//充值
else
{
await RechargeAsync(request.Adapt<RechargeRequest>(), gainfo);
}
//获取人员余额
return await _dbContext.Queryable<GainfoEntity>()
.LeftJoin<DepartmentEntity>((ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<CanteenUserEntity>((ga, department, mealUser) => ga.No == mealUser.UserNo)
.Where(ga => ga.Id == gainfo.Id)
.Select((ga, department, mealUser) => new OrderResultResponse
{
UserCode = ga.Code,
UserName = ga.Name,
DepartmentNo = ga.DepartmentNo,
DepartmentName = department.Name,
Balance = mealUser.Balance
})
.SingleAsync();
}
/// <summary>
/// 消费
/// </summary>
/// <param name="request"></param>
/// <param name="gainfo"></param>
/// <returns></returns>
private async Task ConsumeAsync(ConsumeRequest request, GainfoEntity gainfo)
{
var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.DeviceUniqueNo).Where(x => x.Enable).FirstAsync();
device.ThrowIfNull("设备不存在或者尚未启用");
var registry = await _dbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo).FirstAsync();
registry.ThrowIfNull("设备尚未注册");
var businessPlace = await _dbContext.Queryable<CanteenBusinessPlaceEntity>().Where(x => x.Code == registry.BusinessPlaceCode).FirstAsync();
businessPlace.ThrowIfNull("营业点尚未设置");
var shifts = await _dbContext.Queryable<CanteenBusinessShiftEntity>().Where(x => x.BusinessPlaceCode == registry.BusinessPlaceCode).ToListAsync();
//todo
//获取当前消费餐次
var shifts = await _dbContext.Queryable<CanteenBusinessShiftEntity>().Where(x => x.BusinessPlaceCode == businessPlace.Code).ToListAsync();
//todo
var shift = shifts.FirstOrDefault(x => new TimePeriod()
{
Start = x.Start,
End = x.End,
End = x.End
}.IsPresent1(request.CostDateTime));
//根据档案号
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>()
.Where(x => x.UserNo == request.UserUniqueNo || x.UserCode == request.UserUniqueNo)
.FirstAsync();
canteenUser.ThrowIfNull($"{request.DeviceUniqueNo}不存在,无法就餐");
var gafinfo = await _dbContext.Queryable<GainfoEntity>()
.Where(x => x.No == canteenUser.UserNo)
.FirstAsync();
var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No);
var settings = await _canteenSettingService.GetUserSettingAsync(request.UserUniqueNo);
var switchTime = GetSetting<TimeOnly?>(settings, CanteenSettingItemEnumType.BusinessSwitchTime);
//金额处理
request.Amount = request.Type == BalanceRecordTypeEnumType.In ? Math.Abs(request.Amount) : -Math.Abs(request.Amount);
var shiftTimePeriod = new TimePeriod()
{
@@ -82,7 +117,7 @@ public class OrderService : IOrderService
End = shift?.End
};
//成本日期 todo 优化
//计算成本日期 todo 优化
var costDate = DateTime.Now;
if (shift == null)
{
@@ -106,136 +141,141 @@ public class OrderService : IOrderService
{
RequestJson = request.ToJson(),
ThirdNo = request.ThirdNo,
Type = request.Type.Value,
Name = gafinfo.Name,
Type = BalanceRecordTypeEnumType.Out,
Name = gainfo.Name,
Source = request.Source,
UserNo = canteenUser.UserNo,
UserCode = canteenUser.UserCode,
UserNo = gainfo.No,
UserCode = gainfo.Code,
Amount = request.Amount,
BusinessPlaceCode = businessPlace.Code,
BusinessShiftCode = shift?.Code,
CostDate = costDate.Date,
CostId = canteenUser.CostId,
DepartmentNo = gafinfo.DepartmentNo,
DeviceInfo = device.Code.ToString(),
CostId = gainfo.CostId,
DepartmentNo = gainfo.DepartmentNo,
DeviceInfo = request.DeviceUniqueNo,
No = "O" + SnowFlakeHelper.Instance.NextId(),
SubsidiesFromMonth = DateTime.Now.ToString("yyyyMM"),
IsOffline = request.IsOffline,
IsCostCrossTenant = GetSetting<bool>(settings, CanteenSettingItemEnumType.AllowCrossTenant),
OriginTenantId = canteenUser.TenantId,//人员可能跨基地消费
OriginTenantId = gainfo.Werks,//人员可能跨基地消费
//餐别异常处理
Status = shift == null ? BalanceRecordStatusEnumType.Doubtful : BalanceRecordStatusEnumType.Valid,
OrderStatus = CanteenOrderStatusEnumType.Wait,
//设备才能标识当前消费的基地
TenantId = device.TenantId,
//默认为admin
CreatedBy = 1,
CreateTime = DateTime.Now,
ModifiedBy = 1,
ModifiedTime = DateTime.Now,
OrderStatus = CanteenOrderStatusEnumType.Wait,
CostDateTime = request.CostDateTime,
//标识当前消费的基地
TenantId = businessPlace.TenantId,
};
var id = await _dbContext.InsertReturnIdentityAsync(order);
var result = await _dbContext.UseTransactionAsync(async () =>
var orderId = await _dbContext.InsertReturnIdentityAsync(order);
//await _dbContext.Client.Ado.BeginTranAsync();
try
{
try
{
var r = await GenerateChargeRecordAsync(id, settings, shifts, request.CostDateTime);
return r;
}
catch (Exception)
{
throw;
}
finally
{
//订单消费成功
order.OrderStatus = CanteenOrderStatusEnumType.Successful;
await _dbContext.UpdateAsync(order);
}
});
await GenerateConsumeRecordAsync(orderId, settings, shifts, request.CostDateTime);
order.OrderStatus = CanteenOrderStatusEnumType.Successful;
if (!result.IsSuccess)
{
throw new UserFriendlyException(result.ErrorMessage);
//await _dbContext.Client.Ado.CommitTranAsync();
}
return result.Data;
}
public async Task<OrderConsumeResponse> GenerateChargeRecordAsync(long orderId,
Dictionary<CanteenSettingItemEnumType, string> settings,
List<CanteenBusinessShiftEntity> shifts,
DateTime costDateTime)
{
var order = await _dbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).FirstAsync();
//校验
await Verify(settings, shifts, costDateTime, order);
return await ContinueUpdateAsync(async () =>
catch (Exception)
{
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
//金额+-
canteenUser.Balance += order.Amount;
if (order.Type == BalanceRecordTypeEnumType.Out)
{
if (canteenUser.Balance < 0)
{
throw new UserFriendlyException("余额不足,无法消费");
}
}
var effect = await _dbContext.Updateable<CanteenUserEntity>()
.SetColumns(x => x.Balance == canteenUser.Balance)
.SetColumns(x => x.Version == x.Version + 1)
.Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致
.ExecuteCommandAsync();
if (effect <= 0) throw new VersionExceptions("更新版本冲突");
//写入消费记录
var balanceRecord = order.Adapt<BalanceRecordEntity>();
await _dbContext.InsertAsync(balanceRecord);
return await _dbContext.Queryable<GainfoEntity>()
.LeftJoin<DepartmentEntity>((ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<CanteenUserEntity>((ga, department, mealUser) => ga.No == mealUser.UserNo)
.Select((ga, department, mealUser) => new OrderConsumeResponse
{
UserCode = ga.Code,
UserName = ga.Name,
DepartmentNo = ga.DepartmentNo,
DepartmentName = department.Name,
Balance = mealUser.Balance
})
.FirstAsync();
}, 5);
order.OrderStatus = CanteenOrderStatusEnumType.Failure;
//await _dbContext.Client.Ado.RollbackTranAsync();
throw;
}
finally
{
await _dbContext.UpdateAsync(order);
}
}
/// <summary>
/// 充值
/// </summary>
/// <param name="request"></param>
/// <param name="gainfo"></param>
/// <returns></returns>
private async Task RechargeAsync(RechargeRequest request, GainfoEntity gainfo)
{
var settings = await _canteenSettingService.GetUserSettingAsync(request.UserUniqueNo);
var order = new CanteenOrderEntity
{
RequestJson = request.ToJson(),
ThirdNo = request.ThirdNo,
Type = BalanceRecordTypeEnumType.Out,
Name = gainfo.Name,
Source = request.Source,
UserNo = gainfo.No,
UserCode = gainfo.Code,
Amount = request.Amount,
BusinessPlaceCode = Guid.Empty,
BusinessShiftCode = null,
CostDate = DateTime.Now.Date,
CostId = gainfo.CostId,
DepartmentNo = gainfo.DepartmentNo,
DeviceInfo = string.Empty,
No = "O" + SnowFlakeHelper.Instance.NextId(),
SubsidiesFromMonth = DateTime.Now.ToString("yyyyMM"),
IsOffline = false,
IsCostCrossTenant = GetSetting<bool>(settings, CanteenSettingItemEnumType.AllowCrossTenant),
OriginTenantId = gainfo.Werks,//人员可能跨基地消费
Status = BalanceRecordStatusEnumType.Valid,
OrderStatus = CanteenOrderStatusEnumType.Wait,
CostDateTime = request.CostDateTime,
//标识当前消费的基地
TenantId = gainfo.Werks,
};
var orderId = await _dbContext.InsertReturnIdentityAsync(order);
try
{
await GenerateRechargeRecordAsync(orderId);
order.OrderStatus = CanteenOrderStatusEnumType.Successful;
}
catch (Exception)
{
order.OrderStatus = CanteenOrderStatusEnumType.Failure;
throw;
}
finally
{
await _dbContext.UpdateAsync(order);
}
}
//******************************************************* help methods ************************************************************/
/// <summary>
/// 设备并发更新
/// 设备并发更新 需要抛出VersionExceptions
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="func"></param>
/// <param name="retry"></param>
/// <param name="retry">并发冲突处理次数</param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
private async Task<T> ContinueUpdateAsync<T>(Func<Task<T>> func, int retry)
private async Task ContinueUpdateAsync(Func<Task> func, int retry)
{
for (int i = 0; i < retry; i++)
{
try
{
return await func();
await func();
return;
}
catch (Exception ex) when (ex is VersionExceptions)
{
@@ -247,7 +287,7 @@ public class OrderService : IOrderService
}
}
throw new UserFriendlyException("消费失败,请重试");
throw new UserFriendlyException("操作失败,请重试");
}
@@ -270,7 +310,6 @@ public class OrderService : IOrderService
}
/// <summary>
/// 验证参数
/// </summary>
@@ -342,4 +381,80 @@ public class OrderService : IOrderService
}
}
}
/// <summary>
/// 生成消费记录
/// </summary>
/// <param name="orderId"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
/// <exception cref="VersionExceptions"></exception>
private async Task GenerateRechargeRecordAsync(long orderId)
{
var order = await _dbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).FirstAsync();
await ContinueUpdateAsync(async () =>
{
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
//金额+-
canteenUser.Balance += order.Amount;
var effect = await _dbContext.Updateable<CanteenUserEntity>()
.SetColumns(x => x.Balance == canteenUser.Balance)
.SetColumns(x => x.Version == x.Version + 1)
.Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致
.ExecuteCommandAsync();
if (effect <= 0) throw new VersionExceptions("更新版本冲突");
//写入记录
var balanceRecord = order.Adapt<BalanceRecordEntity>();
await _dbContext.InsertAsync(balanceRecord);
}, 5);
}
/// <summary>
/// 生成充值记录
/// </summary>
/// <param name="orderId"></param>
/// <param name="settings"></param>
/// <param name="shifts"></param>
/// <param name="costDateTime"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
/// <exception cref="VersionExceptions"></exception>
private async Task GenerateConsumeRecordAsync(long orderId,
Dictionary<CanteenSettingItemEnumType, string> settings,
List<CanteenBusinessShiftEntity> shifts,
DateTime costDateTime)
{
var order = await _dbContext.Queryable<CanteenOrderEntity>().Where(x => x.Id == orderId).FirstAsync();
//校验
await Verify(settings, shifts, costDateTime, order);
await ContinueUpdateAsync(async () =>
{
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
//金额+-
canteenUser.Balance += order.Amount;
if (canteenUser.Balance < 0)
{
throw new UserFriendlyException("余额不足,无法消费");
}
var effect = await _dbContext.Updateable<CanteenUserEntity>()
.SetColumns(x => x.Balance == canteenUser.Balance)
.SetColumns(x => x.Version == x.Version + 1)
.Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致
.ExecuteCommandAsync();
if (effect <= 0) throw new VersionExceptions("更新版本冲突");
//写入记录
var balanceRecord = order.Adapt<BalanceRecordEntity>();
await _dbContext.InsertAsync(balanceRecord);
}, 5);
}
}