feat 获取当前人员信息
This commit is contained in:
@@ -7,6 +7,9 @@ using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace Dlhis.Canteen.Order.Controllers;
|
||||
|
||||
/// <summary>
|
||||
/// 充值/消费
|
||||
/// </summary>
|
||||
[Authorize]
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
|
||||
@@ -59,11 +59,11 @@ public class OrderService : IOrderService
|
||||
|
||||
//根据档案号
|
||||
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>()
|
||||
.Where(x => x.UserId == request.UserUniqueNo || x.UserCode == request.UserUniqueNo)
|
||||
.Where(x => x.UserNo == request.UserUniqueNo || x.UserCode == request.UserUniqueNo)
|
||||
.FirstAsync();
|
||||
|
||||
var gafinfo = await _dbContext.Queryable<GainfoEntity>()
|
||||
.Where(x => x.No == canteenUser.UserId)
|
||||
.Where(x => x.No == canteenUser.UserNo)
|
||||
.FirstAsync();
|
||||
|
||||
var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No);
|
||||
@@ -102,7 +102,7 @@ public class OrderService : IOrderService
|
||||
OrderStatus = CanteenOrderStatusEnumType.Wait,
|
||||
Name = gafinfo.Name,
|
||||
Source = request.Source,
|
||||
UserId = canteenUser.UserId,
|
||||
UserId = canteenUser.UserNo,
|
||||
UserCode = canteenUser.UserCode,
|
||||
Amount = request.Amount,
|
||||
BusinessPlaceCode = businessPlace.Code,
|
||||
@@ -207,7 +207,7 @@ public class OrderService : IOrderService
|
||||
{
|
||||
try
|
||||
{
|
||||
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>().Where(x => x.UserId == order.UserId).FirstAsync();
|
||||
var canteenUser = await _dbContext.Queryable<CanteenUserEntity>().Where(x => x.UserNo == order.UserId).FirstAsync();
|
||||
//金额+-
|
||||
canteenUser.Balance += order.Amount;
|
||||
|
||||
@@ -222,7 +222,7 @@ public class OrderService : IOrderService
|
||||
var effect = await _dbContext.Updateable<CanteenUserEntity>()
|
||||
.SetColumns(x => x.Balance == canteenUser.Balance + order.Amount)
|
||||
.SetColumns(x => x.Version == x.Version + 1)
|
||||
.Where(x => x.UserId == order.UserId && x.Version == canteenUser.Version)//必须与查询时的version一致
|
||||
.Where(x => x.UserNo == order.UserId && x.Version == canteenUser.Version)//必须与查询时的version一致
|
||||
.ExecuteCommandAsync();
|
||||
|
||||
if (effect <= 0)
|
||||
|
||||
Reference in New Issue
Block a user