From d6af4520eb948a5b1ab1c6c4352d9688513e1713 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期四, 27 三月 2025 16:26:18 +0800 Subject: [PATCH] fix:新增微信支付查询 --- LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 210 insertions(+), 4 deletions(-) diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs index 58b03bb..d0f5172 100644 --- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs +++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs @@ -1,7 +1,11 @@ -锘縰sing LifePayment.Application.Contracts; +锘縰sing Alipay.AopSdk.F2FPay.Model; +using LifePayment.Application.Contracts; +using LifePayment.Application.LifePay; +using LifePayment.Domain.Common; using LifePayment.Domain.Shared; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Linq; @@ -19,17 +23,40 @@ public class LifePayController : AbpController { private readonly ILifePayService _lifePayService; + private readonly IStatisticsService _statisticsService; private readonly IWebClientInfoProvider _webClientInfoProvider; + private readonly ICommonService _commonService; + private readonly ILifePayOrderService _lifePayOrderService; + private readonly ILogger<LifePayController> _logger; public LifePayController( ILifePayService lifePayService, - IWebClientInfoProvider webClientInfoProvider + IStatisticsService statisticsService, + IWebClientInfoProvider webClientInfoProvider, + ICommonService commonService, + ILifePayOrderService lifePayOrderService, + ILogger<LifePayController> logger ) { _lifePayService = lifePayService; + _statisticsService = statisticsService; _webClientInfoProvider = webClientInfoProvider; + _commonService = commonService; + _lifePayOrderService = lifePayOrderService; + _logger = logger; } #region 鏌ヨ + + /// <summary> + /// 鑾峰彇椤堕儴缁熻鏁版嵁 + /// </summary> + /// <returns></returns> + [HttpGet] + [AllowAnonymous] + public async Task<TopStatisticsOutput> GetTopStatistics() + { + return await _statisticsService.GetTopStatistics(); + } /// <summary> /// 鑾峰彇鐢佃垂闈㈠�� @@ -107,6 +134,20 @@ } /// <summary> + /// 娣诲姞鏃ュ織 + /// </summary> + /// <returns></returns> + [HttpPost] + [AllowAnonymous] + + public async Task<int> AddLogger(LogErrorInput input) + { + Logger.LogError("鍓嶇閿欒锛�" + input.Error); + return Constant.SUCCESS; + } + + + /// <summary> /// 鑾峰彇鎶樻墸 /// </summary> /// <returns></returns> @@ -115,6 +156,17 @@ public async Task<List<LifePayRateListOutput>> GetRate() { return await _lifePayService.GetRate(); + } + + /// <summary> + /// 鑾峰彇娓犻亾鎶樻墸 + /// </summary> + /// <returns></returns> + [HttpPost] + [AllowAnonymous] + public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input) + { + return await _lifePayService.GetChannelRate(input); } /// <summary> @@ -139,6 +191,16 @@ return await _lifePayService.GetIntroInfo(type); } + /// <summary> + /// 鑾峰彇鍦ㄧ嚎瀹㈡湇 + /// </summary> + /// <returns></returns> + [HttpGet] + [AllowAnonymous] + public async Task<string> GetOnlineService() + { + return await _commonService.GetOnlineService(); + } /// <summary> /// 鑾峰彇鐢ㄦ埛鍒嗛〉鏁版嵁 @@ -146,7 +208,7 @@ /// <param name="input"></param> /// <returns></returns> [HttpPost] - public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input) + public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input) { return await _lifePayService.GetUserPage(input); } @@ -160,6 +222,39 @@ 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> + /// 鑾峰彇璁㈠崟璇︽儏 + /// </summary> + /// <param name="orderNo"></param> + /// <returns></returns> + [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> @@ -210,6 +305,15 @@ public async Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input) { return await _lifePayService.GetLifePayChannlesPage(input); + } + + /// <summary> + /// 鑾峰彇鍏ㄩ儴缂磋垂娓犻亾 + /// </summary> + [HttpGet] + public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList() + { + return await _lifePayService.GetLifePayChannlesAllList(); } /// <summary> @@ -299,8 +403,75 @@ 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; + } + /// <summary> + /// 鑾峰彇鍏呭�兼祦姘村垎椤垫暟鎹� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input) + { + return await _lifePayOrderService.GetLifePayRechargeReceiptsPage(input); + } + + /// <summary> + /// 鏌ヨ鏀粯瀹濇敮浠樿鍗曚俊鎭� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + [AllowAnonymous] + public async Task<Alipay.EasySDK.Payment.Common.Models.AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input) + { + return await _lifePayService.QueryAlipayTrade(input); + } + + /// <summary> + /// 鏌ヨ鏀粯瀹濋��娆捐鍗曚俊鎭� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + [AllowAnonymous] + public async Task<Alipay.EasySDK.Payment.Common.Models.AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input) + { + return await _lifePayService.QueryAlipayTradeRefund(input); + } + + + [HttpGet] + [AllowAnonymous] + public async Task WxPayDomesticRefundsQuery(string outTradeNo) + { + await _lifePayService.WxPayDomesticRefundsQuery(outTradeNo); } #endregion @@ -344,6 +515,17 @@ public async Task<CreateLifePayOrderOutput> CreateLifePayGasOrder(CreateLifePayOrderInput<LifeGasData> input) { return await _lifePayService.CreateLifePayGasOrder(input); + } + + /// <summary> + /// 淇敼瀹為檯鍒拌处閲戦 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + public async Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input) + { + return await _lifePayService.UpdateLifePayOrderActualReceivedAmount(input); } /// <summary> @@ -475,6 +657,30 @@ } /// <summary> + /// 鍦ㄧ嚎瀹㈡湇閰嶇疆 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + public async Task<int> UpdateOnlineService(OnlineServiceInput input) + { + await _commonService.UpdateOnlineService(input); + return Constant.SUCCESS; + } + + /// <summary> + /// 涓婁紶鍏呭�兼祦姘� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpPost] + public async Task<int> AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input) + { + await _lifePayOrderService.AddUpdatePayRechargeReceipts(input); + return Constant.SUCCESS; + } + + /// <summary> /// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷 /// </summary> /// <param name="input"></param> -- Gitblit v1.9.1