From 95798bbe8e398d3dd75926e18dfef2e14d1bc7cc Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 10:18:10 +0800
Subject: [PATCH] fix:流水分页数据返回结果更新
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index 16fe3b9..f17ba62 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -44,7 +44,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
+ public async Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input)
{
var list = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false)
.WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord))
@@ -62,10 +62,10 @@
.GetPageResult(input.PageModel);
var total = await _lifePayRechargeReceiptsRepository.Where(x => x.IsDeleted == false).SumAsync(x => x.RechargeAmount);
- LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput> result = new LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>();
- result.Data = list.Data;
- result.TotalRechargeAmount = total;
- return result;
+ LifePayRechargeReceiptsStatistics objectData = new LifePayRechargeReceiptsStatistics();
+ objectData.TotalRechargeAmount = total;
+ list.ObjectData = objectData;
+ return list;
}
@@ -109,7 +109,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
+ public async Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
{
var list = await _lifePayExpensesReceiptsRepository.Where(x => x.IsDeleted == false)
.WhereIf(input.KeyWord.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWord) || x.OutOrderNo.Contains(input.KeyWord))
@@ -133,12 +133,12 @@
var totalIncome = await _lifePayExpensesReceiptsRepository.Where(x => x.IsDeleted == false && x.ExpensesReceiptsType == ExpensesReceiptsTypeEnum.Expenses).SumAsync(x => x.Amount);
var totalRefund = await _lifePayExpensesReceiptsRepository.Where(x => x.IsDeleted == false && x.ExpensesReceiptsType == ExpensesReceiptsTypeEnum.Receipts).SumAsync(x => x.Amount);
- LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput> result = new LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>();
- result.Data = list.Data;
- result.TotalIncome = totalIncome;
- result.TotalRefund = totalRefund;
- result.RealIncome = totalIncome - totalRefund;
- return result;
+ LifePayExpensesReceiptsStatistics objectData = new LifePayExpensesReceiptsStatistics();
+ objectData.TotalIncome = totalIncome;
+ objectData.TotalRefund = totalRefund;
+ objectData.RealIncome = totalIncome - totalRefund;
+ list.ObjectData = objectData;
+ return list;
}
/// <summary>
@@ -168,7 +168,7 @@
if (input.ExpensesReceiptsType == ExpensesReceiptsTypeEnum.Expenses)
{
var query = await _aliPayApi.OrderInQuiry(new OrderInQuiryInput() { OutTradeNo = input.OrderNo });
- if (query.Code == AlipayResultCode.Success && (query.TradeStatus == AlipayStatus.TRADESUCCESS
+ if (query.Code == AlipayResultCode.Success && (query.TradeStatus == AlipayStatus.TRADESUCCESS
|| query.TradeStatus == AlipayStatus.TRADECLOSED))
{
data.ExtraProperties = JsonConvert.SerializeObject(query);
@@ -182,7 +182,7 @@
if (query.Code == AlipayResultCode.Success && query.RefundStatus == AlipayRefundStatus.Success)
{
data.ExtraProperties = JsonConvert.SerializeObject(query);
- //data.FinishTime = Convert.ToDateTime(query.SendPayDate);
+ data.FinishTime = Convert.ToDateTime(query.GmtRefundPay);
await _lifePayExpensesReceiptsRepository.InsertAsync(data);
}
}
--
Gitblit v1.9.1