From bbc5287551f44cef556f51744c9aba408ac50abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com>
Date: Mon, 15 Jan 2024 15:47:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E8=B4=A2=E5=AF=8C?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Analyses/BbsUserAnalyseService.cs         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
index e7d46205..6d1fce50 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
@@ -4,6 +4,7 @@ using SqlSugar;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser;
+using Yi.Framework.Bbs.Domain.Entities;
 using Yi.Framework.Bbs.Domain.Managers;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Shared.Consts;
@@ -38,16 +39,17 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
         }
 
         /// <summary>
-        /// 积分排行榜
+        /// 积分钱钱排行榜
         /// </summary>
         /// <returns></returns>
         [HttpGet("analyse/bbs-user/integral-top")]
         public async Task<List<BbsUserGetListOutputDto>> GetIntegralTopUserAsync([FromQuery] PagedResultRequestDto input)
         {
             var randUserIds = await _bbsUserManager._userRepository._DbQueryable
-                .Where(x => x.UserName != UserConst.Admin)
-                .OrderBy(x => SqlFunc.GetRandom())
-                .Select(x => x.Id).
+                .Where(user => user.UserName != UserConst.Admin)
+                .LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id==info.UserId)
+                .OrderByDescending((user, info)=>info.Money)
+                .Select((user, info) => user.Id).
                 ToPageListAsync(input.SkipCount, input.MaxResultCount);
             var output = await _bbsUserManager.GetBbsUserInfoAsync(randUserIds);
             return output.Adapt<List<BbsUserGetListOutputDto>>();