diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index bea63211..2a508b8d 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -583,12 +583,29 @@ public class OrderService : BaseOrderService, IOrderService try { - await EMealVoucherConsumeAsync(request.Adapt(), gainfo); + await EMealVoucherConsumeAsync(request.Adapt(), gainfo, eMealVoucherQrCode.OriginData, no, ts, idNo); } catch (Exception ex) { message = ex.Message; } + + //获取餐券余额 + var data = await DbContext.Queryable() + .LeftJoin((x, d) => x.No == d.No) + .Where((x, d) => d.IdNo == idNo) + .Select((x, d) => new OrderResultResponse + { + CurrentBalance = d.Balance + }) + .SingleAsync(); + + return new DefaultApiResult + { + Code = message.IsPresent() ? ApiStateCode.Error : ApiStateCode.Success, + Data = data, + Msg = message + }; } else { @@ -692,7 +709,6 @@ public class OrderService : BaseOrderService, IOrderService private async Task EMealVoucherConsumeAsync(ConsumeRequest request, GainfoEntity gainfo, string originData, string no, string ts, string idNo) { - var nowDate = DateTime.Now.Date; var current = await DbContext.Queryable() .Where(x => x.No == no && x.IdNo == idNo).SingleAsync(); @@ -767,7 +783,6 @@ public class OrderService : BaseOrderService, IOrderService .SetColumns(x => x.ModifiedTime == DateTime.Now) .Where(x => x.Id == orderId) .ExecuteCommandAsync(); - } catch (Exception ex) {