From 2ece861c311599d31c96ab36fcf3b19d6208d552 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 13:13:39 +0800
Subject: [PATCH] fix:账号管理新增渠道

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 2ea55a1..861b680 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -171,10 +171,13 @@
     /// <returns></returns>
     public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input)
     {
+        var channel = await _lifePayChannlesRep.ToListAsync();
         return await _lifePayUserRepository.Select(x =>
                                                    new UserListOutput()
                                                    {
                                                        Id = x.Id,
+                                                       //CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
+                                                       //LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : channel.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
                                                        PhoneNumber = x.PhoneNumber,
                                                        CreationTime = x.CreationTime,
                                                        LastLoginTime = x.LastLoginTime
@@ -352,19 +355,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)
@@ -1583,6 +1579,20 @@
         return result;
     }
 
+    private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
+    {
+        return _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,
+                    });
+    }
 
-    #endregion
-}
+        #endregion
+    }

--
Gitblit v1.9.1