From fc85a3382990bcfb5f4d1a77f1525328343b3c8c Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 25 三月 2025 18:20:47 +0800 Subject: [PATCH] fix: 新增修改实际到账金额接口 --- LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 95 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 83 insertions(+), 12 deletions(-) diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs index 7a3c36b..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; } @@ -39,12 +42,12 @@ /// 鑾峰彇椤堕儴缁熻鏁版嵁 /// </summary> /// <returns></returns> - //[HttpGet] - //[AllowAnonymous] - //public async Task<TopStatisticsOutput> GetTopStatistics() - //{ - // return await _lifePayService.GetTopStatistics(); - //} + [HttpGet] + [AllowAnonymous] + public async Task<TopStatisticsOutput> 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> @@ -192,16 +206,37 @@ } /// <summary> + /// 鑾峰彇閫�娆捐鍗曞垎椤垫暟鎹� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input) + { + return await _lifePayService.GetLifePayRefundOrderPage(input); + } + + /// <summary> /// 鑾峰彇璁㈠崟璇︽儏 /// </summary> /// <param name="orderNo"></param> /// <returns></returns> - //[HttpGet] - //public async Task<UserLifePayOrderOutput> GetLifePayOrderDetail(string orderNo) - //{ - // return await _lifePayService.GetLifePayOrderDetail(orderNo); - //} + [HttpGet] + public async Task<LifePayOrderOutput> GetLifePayOrderDetail(string orderNo) + { + return await _lifePayService.GetLifePayOrderDetail(orderNo); + } + /// <summary> + /// 鑾峰彇閫�娆捐鍗曡鎯� + /// </summary> + /// <param name="orderNo"></param> + /// <returns></returns> + [HttpGet] + public async Task<LifePayRefundOrderOutput> GetLifePayRefundOrderDetail(string orderNo) + { + return await _lifePayService.GetLifePayRefundOrderDetail(orderNo); + } /// <summary> /// 鑾峰彇鎴戠殑璁㈠崟鍒嗛〉鏁版嵁 @@ -349,8 +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<string> GetBillErceiptExport(string orderNo) + { + var data = await _lifePayService.GetBillErceiptExport(orderNo); + + return data; } #endregion @@ -397,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