From 1447caa6b184ee1e80970740e30fa970c3d08a78 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 13:54:38 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3
---
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index bdd5ba4..e51e445 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -437,18 +437,29 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
- public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
+ public async Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
{
return await _lifePayOrderService.GetLifePayRechargeReceiptsPage(input);
}
/// <summary>
+ /// 鑾峰彇娓犻亾鍒嗕剑鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<PageOutput<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakePage(LifePayChannlesRakePageInput input)
+ {
+ return await _lifePayOrderService.GetLifePayChannlesRakePage(input);
+ }
+
+ /// <summary>
/// 鑾峰彇鏀舵敮娴佹按鍒嗛〉鏁版嵁
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
- public async Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
+ public async Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
{
return await _lifePayOrderService.GetLifePayExpensesReceiptsPage(input);
}
@@ -528,6 +539,10 @@
return res;
}
+ /// <summary>
+ /// 鍚屾璁㈠崟鏀舵敮淇℃伅
+ /// </summary>
+ /// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task GetAllLifePayExpensesReceipts()
@@ -535,6 +550,18 @@
await _lifePayOrderService.GetAllLifePayExpensesReceipts();
}
+ /// <summary>
+ /// 鍚屾璁㈠崟
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task GetAllChannlesRake()
+ {
+ await _lifePayOrderService.GetAllChannlesRake();
+ }
+
+
#endregion
#region 鎿嶄綔
--
Gitblit v1.10.0