fix merge error

This commit is contained in:
2024-03-23 00:57:47 +08:00
parent cb5e06b6ed
commit f42900a962
6 changed files with 31 additions and 141 deletions

View File

@@ -297,37 +297,6 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
}, 5);
}
var balance = await DbContext.Queryable<BalanceRecordEntity>().Where(x => x.No == request.No).SingleAsync();
await DbContext.Updateable<BalanceRecordEntity>()
.SetColumns(x => x.Status == BalanceRecordStatusEnumType.Obsolute)
.SetColumns(x => x.Remark == request.Reason)
.SetColumns(x => x.ModifiedTime == now)
.SetColumns(x => x.ModifiedBy == userId)
.Where(x => x.No == request.No)
.ExecuteCommandAsync();
var amount = Math.Abs(order.Amount);
//尝试5次
await ContinueUpdateAsync(async () =>
{
var mealInfo = await DbContext.Queryable<GainfoMealEntity>().Where(x => x.UserNo == order.UserNo).FirstAsync();
var effect = await DbContext.Updateable<GainfoMealEntity>()
.SetColumns(x => x.Balance == x.Balance + amount)
.SetColumns(x => x.ModifiedTime == now)
.SetColumns(x => x.ModifiedBy == userId)
.Where(x => x.Id == mealInfo.Id && x.Version == mealInfo.Version)
.ExecuteCommandAsync();
if (effect <= 0)
{
throw new VersionExceptions("取消订单失败!");
}
}, 5);
}
/// <summary>
/// 检查我的订餐是否存在,存在抛出异常