From aff6340db92f4801184db829eccfed93ff6fedb3 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 16:41:30 +0800
Subject: [PATCH] fix:提交
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index aa03716..fca55d3 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -58,7 +58,7 @@
{
var list = await _lifePayConsumption.Where(x => x.IsDeleted == false)
.WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) || x.OutOrderNo.Contains(input.KeyWord) || x.ChannelId.Contains(input.KeyWord))
- .WhereIf(input.Flow.HasValue,x => x.Flow == input.Flow)
+ .WhereIf(input.Flow.HasValue, x => x.Flow == input.Flow)
.WhereIf(input.TimeBegin.HasValue, x => x.FinishTime >= input.TimeBegin)
.WhereIf(input.TimeEnd.HasValue, x => x.FinishTime <= input.TimeEnd)
.Select(x => new LifePayConsumptionListOutput()
@@ -71,12 +71,15 @@
FrozenStatus = x.FrozenStatus,
Flow = x.Flow,
DeductionAmount = x.DeductionAmount,
+ FrozenAmount = x.FrozenAmount.Value
})
.GetPageResult(input.PageModel);
- var total = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.RechargeAmount);
- LifePayRechargeReceiptsStatistics objectData = new LifePayRechargeReceiptsStatistics();
- objectData.TotalRechargeAmount = total;
+ var totalDeductionAmount = await _lifePayConsumption.Where(x => x.IsDeleted == false).SumAsync(x => x.DeductionAmount);
+ var totalFrozenAmount = await _lifePayConsumption.Where(x => x.IsDeleted == false).SumAsync(x => x.FrozenAmount);
+ LifePayConsumptionStatistics objectData = new LifePayConsumptionStatistics();
+ objectData.TotalDeductionAmount = totalDeductionAmount;
+ objectData.TotalFrozenAmount = totalFrozenAmount.Value;
list.ObjectData = objectData;
return list;
}
@@ -244,7 +247,6 @@
}
}
-
/// <summary>
/// 鎻掑叆鏀舵敮娴佹按
/// </summary>
@@ -322,6 +324,33 @@
}
}
+ /// <summary>
+ /// 缁熻鎵�鏈夋秷璐规祦姘�
+ /// </summary>
+ /// <returns></returns>
+ public async Task GetAllLifePayConsumption()
+ {
+ var orderList = await _lifePayOrderRepository.Where(x => x.PayStatus == LifePayStatusEnum.宸叉敮浠�).ToListAsync();
+
+ foreach (var item in orderList)
+ {
+ LifePayConsumption lifePayConsumption = new LifePayConsumption()
+ {
+ OrderNo = item.OrderNo,
+ OutOrderNo = item.OutOrderNo,
+ //Amount = item.PayAmount,
+
+ };
+ //switch (item.ACOOLYStatus)
+ //{
+ // case ACOOLYStatusEnum.鍏呭�间腑:
+
+ // break;
+ // default:break;
+ //}
+ }
+ }
+
public async Task GetAllLifePayExpensesReceipts()
{
var orderlist = await (from a in _lifePayOrderRepository.Where(x => x.PayStatus >= LifePayStatusEnum.宸叉敮浠�)
--
Gitblit v1.9.1