From 9ae09cab250590a8b6a5e7bd33139578f5200011 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 10:27:25 +0800
Subject: [PATCH] Merge branch 'master' into dev-lifepay-v1.3
---
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
index 929f209..81e6737 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -11,9 +11,6 @@
public interface ILifePayService : IApplicationService
{
-
- //Task<ElectricParValueResponse> GetTopStatistics();
-
/// <summary>
/// 鑾峰彇鐢佃垂闈㈠��
/// </summary>
@@ -52,8 +49,10 @@
/// <returns></returns>
Task LifePaySuccessHandler(string orderNo, string outOrderNo);
+ Task WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus);
+
/// <summary>
- /// 鏀粯鎴愬姛鍥炶皟澶勭悊
+ /// 渚涘簲鍟嗗洖璋冨鐞�
/// </summary>
/// <param name="orderNo"></param>
/// <param name="acoolyOrderNo"></param>
@@ -61,7 +60,7 @@
/// <param name="acoolyStatus"></param>
/// <param name="payAmount"></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);
/// <summary>
/// 鍒涘缓鐢熸椿缂磋垂璇濊垂璁㈠崟
@@ -83,6 +82,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>
/// 閫�娆剧敓娲荤即璐硅鍗�
@@ -146,6 +152,13 @@
/// <returns></returns>
Task<List<LifePayRateListOutput>> GetRate();
+
+ /// <summary>
+ /// 鑾峰彇娓犻亾鎶樻墸
+ /// </summary>
+ /// <returns></returns>
+ Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input);
+
/// <summary>
/// 鑾峰彇鎵嬬画璐硅垂鐜�
/// </summary>
@@ -194,6 +207,7 @@
/// <returns></returns>
Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input);
+ Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input);
/// <summary>
/// 鑾峰彇璁㈠崟璇︽儏
@@ -252,6 +266,11 @@
Task<List<LifePayOrderListTemplate>> GetLifePayOrderPageExport(QueryLifePayOrderListInput input);
+
+ Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input);
+
+ Task<string> GetBillErceiptExport(string orderNo);
+
/// <summary>
/// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
/// </summary>
--
Gitblit v1.9.1