From 8c4e906848c5f453369ead6cd8024aeb7b113771 Mon Sep 17 00:00:00 2001
From: lingling <kety1122@163.com>
Date: 星期三, 19 三月 2025 16:20:19 +0800
Subject: [PATCH] 添加过滤
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 2ea55a1..3e317b6 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -45,7 +45,7 @@
private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
private readonly IDataFilter dataFilter;
-
+ private readonly IChannelFilter _channelFilter;
private readonly IAliPayApi _aliPayApi;
private readonly IWxPayApi _wxPayApi;
private readonly WxPayOption _wxPayOptions;
@@ -65,7 +65,8 @@
IOptions<WxPayOption> wxPayOptions,
IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayAccount, Guid> lifePayAccount,
- IDataFilter dataFilter)
+ IDataFilter dataFilter,
+ IChannelFilter channelFilter)
{
_logger = logger;
_aCOOLYManager = aCOOLYManager;
@@ -81,6 +82,7 @@
_lifePayChannlesRep = lifePayChannlesRep;
_lifePayAccount = lifePayAccount;
this.dataFilter = dataFilter;
+ _channelFilter = channelFilter;
}
#region 鏌ヨ
@@ -175,6 +177,8 @@
new UserListOutput()
{
Id = x.Id,
+ CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
+ LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
PhoneNumber = x.PhoneNumber,
CreationTime = x.CreationTime,
LastLoginTime = x.LastLoginTime
@@ -220,7 +224,8 @@
/// <returns></returns>
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
{
- var result = await (from a in _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
+
+ var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -352,19 +357,12 @@
public async Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input)
{
+ return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
+ }
- return await _lifePayChannlesRep.Select(x =>
- new CreateEditPayChannelsInput
- {
- Id = x.Id,
- ChannlesRate = x.ChannlesRate,
- ChannlesName = x.ChannlesName,
- ChannlesNum = x.ChannlesNum,
- Status = x.Status,
- SwitchType = x.SwitchType,
- ChannlesType = x.ChannlesType,
- })
- .GetPageResult(input.PageModel);
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ {
+ return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
}
public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -374,6 +372,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -389,6 +388,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -1200,6 +1200,7 @@
dto.ChannlesName = input.ChannlesName;
dto.ChannlesNum = input.ChannlesNum;
dto.ChannlesRate = input.ChannlesRate;
+ dto.ChannlesRakeRate = input.ChannlesRakeRate;
dto.SwitchType = input.SwitchType;
dto.ChannlesType = input.ChannlesType;
dto.Status = input.Status;
@@ -1583,6 +1584,21 @@
return result;
}
+ private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
+ {
+ return _lifePayChannlesRep.Select(x =>
+ new CreateEditPayChannelsInput
+ {
+ Id = x.Id,
+ ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
+ ChannlesName = x.ChannlesName,
+ ChannlesNum = x.ChannlesNum,
+ Status = x.Status,
+ SwitchType = x.SwitchType,
+ ChannlesType = x.ChannlesType,
+ });
+ }
- #endregion
-}
+ #endregion
+ }
--
Gitblit v1.9.1