From 95798bbe8e398d3dd75926e18dfef2e14d1bc7cc Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 10:18:10 +0800
Subject: [PATCH] fix:流水分页数据返回结果更新
---
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index d0f5172..96e2a15 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -53,9 +53,9 @@
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
- public async Task<TopStatisticsOutput> GetTopStatistics()
+ public async Task<TopStatisticsOutput> GetTopStatistics(string channleId = "")
{
- return await _statisticsService.GetTopStatistics();
+ return await _statisticsService.GetTopStatistics(channleId);
}
/// <summary>
@@ -437,9 +437,20 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
- public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
+ public async Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
{
return await _lifePayOrderService.GetLifePayRechargeReceiptsPage(input);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏀舵敮娴佹按鍒嗛〉鏁版嵁
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
+ {
+ return await _lifePayOrderService.GetLifePayExpensesReceiptsPage(input);
}
/// <summary>
@@ -451,7 +462,16 @@
[AllowAnonymous]
public async Task<Alipay.EasySDK.Payment.Common.Models.AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)
{
- return await _lifePayService.QueryAlipayTrade(input);
+ var res = await _lifePayService.QueryAlipayTrade(input);
+ //await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ //{
+ // OrderNo = input.OutTradeNo,
+ // OutOrderNo = res.TradeNo,
+ // LifePayType = LifePayTypeEnum.AliPay,
+ // ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ // Amount = Convert.ToDecimal(res.ReceiptAmount)
+ //});
+ return res;
}
/// <summary>
@@ -466,14 +486,61 @@
return await _lifePayService.QueryAlipayTradeRefund(input);
}
-
+ /// <summary>
+ /// 鏌ヨ寰俊閫�娆句俊鎭�
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
[HttpGet]
[AllowAnonymous]
- public async Task WxPayDomesticRefundsQuery(string outTradeNo)
+ public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
{
- await _lifePayService.WxPayDomesticRefundsQuery(outTradeNo);
+ var res = await _lifePayService.WxPayDomesticRefundsQuery(outTradeNo);
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = res.OutTradeNo,
+ OutOrderNo = res.TransactionId,
+ LifePayType = LifePayTypeEnum.WxPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ Amount = Convert.ToDecimal(res.Amount.Total)
+ });
+ return res;
}
+ /// <summary>
+ /// 鏌ヨ寰俊璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
+ {
+ var res = await _lifePayService.WxPayTradeQuery(outTradeNo);
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = res.OutTradeNo,
+ OutOrderNo = res.TransactionId,
+ LifePayType = LifePayTypeEnum.WxPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ Amount = Convert.ToDecimal(res.Amount.Total)
+ });
+ return res;
+ }
+
+ /// <summary>
+ /// 鍚屾璁㈠崟鏀舵敮淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [AllowAnonymous]
+ public async Task GetAllLifePayExpensesReceipts()
+ {
+ await _lifePayOrderService.GetAllLifePayExpensesReceipts();
+ }
+
+
+
#endregion
#region 鎿嶄綔
--
Gitblit v1.9.1