From fd5705a460cd8ef559afd33860e148bb16b8616d Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 26 三月 2025 15:18:35 +0800
Subject: [PATCH] fix；用户管理新增查询条件
---
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index 856ba52..ce05b3d 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -20,15 +20,18 @@
public class LifePayController : AbpController
{
private readonly ILifePayService _lifePayService;
+ private readonly IStatisticsService _statisticsService;
private readonly IWebClientInfoProvider _webClientInfoProvider;
private readonly ILogger<LifePayController> _logger;
public LifePayController(
ILifePayService lifePayService,
+ IStatisticsService statisticsService,
IWebClientInfoProvider webClientInfoProvider
, ILogger<LifePayController> logger
)
{
_lifePayService = lifePayService;
+ _statisticsService = statisticsService;
_webClientInfoProvider = webClientInfoProvider;
_logger = logger;
}
@@ -43,7 +46,7 @@
[AllowAnonymous]
public async Task<TopStatisticsOutput> GetTopStatistics()
{
- return await _lifePayService.GetTopStatistics();
+ return await _statisticsService.GetTopStatistics();
}
/// <summary>
@@ -147,6 +150,17 @@
}
/// <summary>
+ /// 鑾峰彇娓犻亾鎶樻墸
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
+ {
+ return await _lifePayService.GetChannelRate(input);
+ }
+
+ /// <summary>
/// 鑾峰彇鎵嬬画璐硅垂鐜�
/// </summary>
/// <returns></returns>
@@ -189,6 +203,17 @@
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
{
return await _lifePayService.GetLifePayOrderPage(input);
+ }
+
+ /// <summary>
+ /// 鑾峰彇閫�娆捐鍗曞垎椤垫暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
+ {
+ return await _lifePayService.GetLifePayRefundOrderPage(input);
}
/// <summary>
@@ -359,17 +384,33 @@
var bytes = ExcelHelper.ListToByteForExcel(data, "xlsx");
return File(bytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "璁㈠崟绠＄悊" + ".xlsx");
}
-
return Json(default);
}
+ /// <summary>
+ /// 瀵煎嚭閫�娆捐鍗旹xcel
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<ActionResult> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)
+ {
+ var data = await _lifePayService.GetLifePayRefudOrderPageExport(input);
+ if (data.Any())
+ {
+ var bytes = ExcelHelper.ListToByteForExcel(data, "xlsx");
+ return File(bytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "閫�娆剧鐞�" + ".xlsx");
+ }
+ return Json(default);
+ }
+
+
[HttpGet]
- public async Task<ActionResult> GetBillErceiptExport(string orderNo)
+ public async Task<string> GetBillErceiptExport(string orderNo)
{
var data = await _lifePayService.GetBillErceiptExport(orderNo);
-
- return Json(default);
+ return data;
}
#endregion
@@ -416,6 +457,17 @@
}
/// <summary>
+ /// 淇敼瀹為檯鍒拌处閲戦
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input)
+ {
+ return await _lifePayService.UpdateLifePayOrderActualReceivedAmount(input);
+ }
+
+ /// <summary>
/// 閫�娆剧敓娲荤即璐硅鍗�
/// </summary>
/// <param name="input"></param>
--
Gitblit v1.9.1