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.Contracts/LifePay/LifePayOutput.cs | 9 +---
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 13 ++++--
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 24 ++++++------
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 10 ++++-
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs | 4 +-
LifePayment/LifePayment.HttpApi/LifePay/UserRoleController.cs | 6 +++
LifePayment/LifePayment.Application/User/AccountService.cs | 10 +++++
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 6 +++
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 6 +++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 2 +
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 3 +
11 files changed, 65 insertions(+), 28 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs
index a30eaec..0beef1a 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs
@@ -10,11 +10,11 @@
public interface ILifePayOrderService : IApplicationService
{
- Task<LifePayRechargeReceiptsPageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input);
+ Task<PageOutput<LifePayRechargeReceiptsListOutput>> GetLifePayRechargeReceiptsPage(LifePayRechargeReceiptsPageInput input);
Task AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input);
- Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input);
+ Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input);
Task AddLifePayExpensesReceipts(AddLifePayExpensesReceiptsInput input);
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
index 005fcfe..f5cb567 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -300,6 +300,8 @@
/// <returns></returns>
Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo);
+
+
/// <summary>
/// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
/// </summary>
@@ -326,5 +328,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
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 333a00a..7fe3e08 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1110,10 +1110,8 @@
/// </summary>
public string Link { get; set; }
}
-public class LifePayRechargeReceiptsPageOutput<T> : PageOutputBase
+public class LifePayRechargeReceiptsStatistics
{
-
- public List<T> Data { get; set; } = new List<T>();
/// <summary>
/// 绱鍏呭��
@@ -1216,11 +1214,8 @@
/// </summary>
public DateTime FinishTime { get; set; }
}
-public class LifePayExpensesReceiptsPageOutput<T> : PageOutputBase
+public class LifePayExpensesReceiptsStatistics
{
-
- public List<T> Data { get; set; } = new List<T>();
-
/// <summary>
/// 绱鏀跺叆
/// </summary>
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index 0ad8d61..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>
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 11bdb9b..1b8a173 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -872,6 +872,8 @@
return await _wxPayApi.WxPayTradeQuery(outTradeNo);
}
+
+
#endregion
#region 鎿嶄綔
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index d319106..b385f25 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -125,8 +125,9 @@
}
}
- //public async Task<ReceiptsListOutPut> GetReceiptsList()
+ //public async Task<ReceiptsListOutPut> GetReceiptsList(string channleId = "")
//{
+ // var today = DateTime.Now.Date;
//}
}
diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs
index 951403b..43aeddb 100644
--- a/LifePayment/LifePayment.Application/User/AccountService.cs
+++ b/LifePayment/LifePayment.Application/User/AccountService.cs
@@ -92,6 +92,11 @@
return result;
}
+ //public async Task<UserChannelOutput> GetUserChannel()
+ //{
+ // var userchannel = await _userChannleRep.Where
+ //}
+
#endregion
@@ -322,10 +327,15 @@
return res.Id;
}
+
+
+
+
#endregion
#endregion
}
+
}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
index 304c7d8..9d1f2ee 100644
--- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -302,6 +302,12 @@
<param name="outTradeNo"></param>
<returns></returns>
</member>
+ <member name="M:LifePayment.HttpApi.LifePayController.GetAllLifePayExpensesReceipts">
+ <summary>
+ 鍚屾璁㈠崟鏀舵敮淇℃伅
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:LifePayment.HttpApi.LifePayController.CreateLifePayPhoneOrder(LifePayment.Application.Contracts.CreateLifePayOrderInput{LifePayment.Application.Contracts.LifePhoneData})">
<summary>
鍒涘缓鐢熸椿缂磋垂璇濊垂璁㈠崟
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 5c0289b..8b3f52e 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -1681,7 +1681,7 @@
鍦ㄧ嚎瀹㈡湇閾炬帴
</summary>
</member>
- <member name="P:LifePayment.Application.Contracts.LifePayRechargeReceiptsPageOutput`1.TotalRechargeAmount">
+ <member name="P:LifePayment.Application.Contracts.LifePayRechargeReceiptsStatistics.TotalRechargeAmount">
<summary>
绱鍏呭��
</summary>
@@ -1766,21 +1766,26 @@
浜ゆ槗鏃堕棿
</summary>
</member>
- <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsPageOutput`1.TotalIncome">
+ <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsStatistics.TotalIncome">
<summary>
绱鏀跺叆
</summary>
</member>
- <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsPageOutput`1.TotalRefund">
+ <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsStatistics.TotalRefund">
<summary>
绱閫�娆�
</summary>
</member>
- <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsPageOutput`1.RealIncome">
+ <member name="P:LifePayment.Application.Contracts.LifePayExpensesReceiptsStatistics.RealIncome">
<summary>
瀹為檯鏀跺叆
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.ReceiptsListOutPut.CreationTime">
+ <summary>
+ 鍒涘缓鏃堕棿
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.RecordOperateHistoryEto.RelationId">
<summary>
鍏宠仈鍏崇郴ID
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index bdd5ba4..96e2a15 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -437,7 +437,7 @@
/// <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);
}
@@ -448,7 +448,7 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
- public async Task<LifePayExpensesReceiptsPageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
+ public async Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input)
{
return await _lifePayOrderService.GetLifePayExpensesReceiptsPage(input);
}
@@ -528,6 +528,10 @@
return res;
}
+ /// <summary>
+ /// 鍚屾璁㈠崟鏀舵敮淇℃伅
+ /// </summary>
+ /// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task GetAllLifePayExpensesReceipts()
@@ -535,6 +539,8 @@
await _lifePayOrderService.GetAllLifePayExpensesReceipts();
}
+
+
#endregion
#region 鎿嶄綔
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/UserRoleController.cs b/LifePayment/LifePayment.HttpApi/LifePay/UserRoleController.cs
index a0e2a9f..7bf8650 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/UserRoleController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/UserRoleController.cs
@@ -199,5 +199,11 @@
await _identityRoleService.DeleteAsync(id);
return await _userRoleService.DeleteRole(id);
}
+
+ //[HttpGet]
+ //public async Task<UserChannelOutput> GetUserChannel()
+ //{
+ // return await _accountService.GetUserChannel();
+ //}
}
}
\ No newline at end of file
--
Gitblit v1.9.1