From 10496309bfe3a0d65ed012c5598732f5bfac2efd Mon Sep 17 00:00:00 2001 From: lingling <kety1122@163.com> Date: 星期三, 16 四月 2025 17:44:09 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi --- LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 66 +++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 4 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs index e72264b..4e9b5fa 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs @@ -1,4 +1,5 @@ -锘縰sing LifePayment.Domain.Shared; +锘縰sing Alipay.EasySDK.Payment.Common.Models; +using LifePayment.Domain.Shared; using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -50,6 +51,14 @@ Task LifePaySuccessHandler(string orderNo, string outOrderNo); /// <summary> + /// 閫�娆炬垚鍔熷洖璋冨鐞� + /// </summary> + /// <param name="orderNo"></param> + /// <param name="refundStatus"></param> + /// <returns></returns> + Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus); + + /// <summary> /// 渚涘簲鍟嗗洖璋冨鐞� /// </summary> /// <param name="orderNo"></param> @@ -57,8 +66,11 @@ /// <param name="status"></param> /// <param name="acoolyStatus"></param> /// <param name="payAmount"></param> + /// <param name="refundApplyRemark"></param> + /// <param name="parValue"></param> + /// <param name="actualParValue"></param> /// <returns></returns> - Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount); + Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark, decimal? parValue = 0, decimal? actualParValue = 0); /// <summary> /// 鍒涘缓鐢熸椿缂磋垂璇濊垂璁㈠崟 @@ -80,6 +92,13 @@ /// <param name="input"></param> /// <returns></returns> Task<CreateLifePayOrderOutput> CreateLifePayGasOrder(CreateLifePayOrderInput<LifeGasData> input); + + /// <summary> + /// 淇敼瀹為檯鍒拌处閲戦 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input); /// <summary> /// 閫�娆剧敓娲荤即璐硅鍗� @@ -142,6 +161,13 @@ /// </summary> /// <returns></returns> Task<List<LifePayRateListOutput>> GetRate(); + + + /// <summary> + /// 鑾峰彇娓犻亾鎶樻墸 + /// </summary> + /// <returns></returns> + Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input); /// <summary> /// 鑾峰彇鎵嬬画璐硅垂鐜� @@ -218,7 +244,7 @@ /// <returns></returns> Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input); - Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(); + Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input); Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id); @@ -251,9 +277,37 @@ Task<List<LifePayOrderListTemplate>> GetLifePayOrderPageExport(QueryLifePayOrderListInput input); - Task<List<LifePayOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input); + Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input); Task<string> GetBillErceiptExport(string orderNo); + + /// <summary> + /// 鏌ヨ鏀粯瀹濇敮浠樿鍗曚俊鎭� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + Task<AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input); + + /// <summary> + /// 鏌ヨ鏀粯瀹濋��娆捐鍗曚俊鎭� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input); + + /// <summary> + /// 鏌ヨ寰俊閫�娆捐鍗曚俊鎭� + /// </summary> + /// <param name="outTradeNo"></param> + /// <returns></returns> + Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo); + + /// <summary> + /// 鏌ヨ寰俊璁㈠崟淇℃伅 + /// </summary> + /// <param name="outTradeNo"></param> + /// <returns></returns> + Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo); /// <summary> /// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷 @@ -281,5 +335,9 @@ /// <exception cref="UserFriendlyException"></exception> Task<string> GetPayQRCode(LifePayTypeEnum payType, string outTradeNo, string description, decimal amount, string ip, string h5Type); + Task<bool> CheckChannelsStatus(string channlesId); + + + } \ No newline at end of file -- Gitblit v1.9.1