From 1650950e7f246915599e62a3caaadf88e1dd3405 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 28 三月 2025 16:12:46 +0800
Subject: [PATCH] fix：提交
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 10 +++++-----
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index 79ca73e..30d9f45 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -674,4 +674,21 @@
/// 鎷撳睍灞炴��
/// </summary>
public string ExtraProperties { get; set; }
+}
+public class LifePayExpensesReceiptsPageInput : ChannelsBaseInput
+{
+ /// <summary>
+ /// 鏌ヨ鏉′欢
+ /// </summary>
+ public string? KeyWord { get; set; }
+
+ /// <summary>
+ /// 璁拌处寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime? CreationTimeBegin { get; set; }
+
+ /// <summary>
+ /// 璁拌处缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime? CreationTimeEnd { get; set; }
}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index 2655d8e..ce4d0c2 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -112,16 +112,16 @@
{
Id = x.Id,
OrderNo = x.OrderNo,
- RechargeAmount = x.RechargeAmount,
- Remark = x.Remark,
- Voucher = x.Voucher.GetOssPath(),
+ //RechargeAmount = x.RechargeAmount,
+ //Remark = x.Remark,
+ //Voucher = x.Voucher.GetOssPath(),
CreationTime = x.CreationTime,
})
.GetPageResult(input.PageModel);
var total = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.RechargeAmount);
- LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput> result = new LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>();
- result.Data = list.Data;
+ LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput> result = new LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>();
+ //result.Data = list.Data;
result.TotalRechargeAmount = total;
return result;
}
--
Gitblit v1.9.1