From 4a23824ad9cecb91b9c13a4dd71d4c58355b91ce Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 13:16:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 440288d..df3cda1 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
@@ -367,6 +370,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -1585,6 +1589,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
--
Gitblit v1.9.1