From 4a0a0e0bb66f73380ed833b5452ec170dde5553f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Thu, 11 Jan 2024 22:11:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84bbs=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/BbsUser/BbsUserGetListOutputDto.cs   | 11 ++++++++++
 .../Services/Forum/DiscussService.cs          | 12 +++++++---
 .../Managers/BbsUserManager.cs                | 22 +++++++++++++++++--
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserGetListOutputDto.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserGetListOutputDto.cs
index 7197366a..4abd784f 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserGetListOutputDto.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/BbsUser/BbsUserGetListOutputDto.cs
@@ -19,5 +19,16 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.BbsUser
         /// 用户限制
         /// </summary>
         public UserLimitEnum UserLimit { get; set; }
+
+        /// <summary>
+        /// 钱钱
+        /// </summary>
+        public decimal Money { get; set; }
+
+
+        /// <summary>
+        /// 经验
+        /// </summary>
+        public long Experience { get; set; }
     }
 }
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs
index c24de344..d8f8684a 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs
@@ -71,7 +71,9 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
                              Icon = user.Icon,
                              Id = user.Id,
                              Level = info.Level,
-                             UserLimit = info.UserLimit
+                             UserLimit = info.UserLimit,
+                             Money=info.Money,
+                             Experience=info.Experience
                          },
                          Plate = new Contracts.Dtos.Plate.PlateGetOutputDto()
                          {
@@ -128,7 +130,9 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
                              Nick = user.Nick,
                              Icon = user.Icon,
                              Level = info.Level,
-                             UserLimit = info.UserLimit
+                             UserLimit = info.UserLimit,
+                             Money = info.Money,
+                             Experience = info.Experience
                          }
 
                      }, true)
@@ -169,7 +173,9 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
                         Nick = user.Nick,
                         UserName = user.UserName,
                         Remark = user.Remark,
-                        UserLimit = info.UserLimit
+                        UserLimit = info.UserLimit,
+                        Money = info.Money,
+                        Experience = info.Experience
 
                     }
                 }, true)
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs
index 6f8fbb68..fe1ebea1 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs
@@ -25,7 +25,10 @@ namespace Yi.Framework.Bbs.Domain.Managers
         public async Task<BbsUserInfoDto?> GetBbsUserInfoAsync(Guid userId)
         {
             return await _userRepository._DbQueryable.LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.UserId)
-                     .Select((user, info) => new BbsUserInfoDto { Id = user.Id ,Icon=user.Icon,Level=info.Level,UserLimit=info.UserLimit}, true)
+                     .Select((user, info) => new BbsUserInfoDto { Id = user.Id ,Icon=user.Icon,Level=info.Level,UserLimit=info.UserLimit,
+                         Money = info.Money,
+                         Experience = info.Experience
+                     }, true)
                      .FirstAsync(user => user.Id==userId);
         }
 
@@ -34,7 +37,10 @@ namespace Yi.Framework.Bbs.Domain.Managers
             return await _userRepository._DbQueryable
                      .Where(user => userIds.Contains(user.Id))
                 .LeftJoin<BbsUserExtraInfoEntity>((user, info) => user.Id == info.UserId)
-                     .Select((user, info) => new BbsUserInfoDto { Id = user.Id , Icon = user.Icon , Level = info.Level, UserLimit = info.UserLimit },true)
+                     .Select((user, info) => new BbsUserInfoDto { Id = user.Id , Icon = user.Icon , Level = info.Level, UserLimit = info.UserLimit,
+                         Money = info.Money,
+                         Experience = info.Experience
+                     },true)
                 
                      .ToListAsync();
         }
@@ -68,5 +74,17 @@ namespace Yi.Framework.Bbs.Domain.Managers
         /// </summary>
         public UserLimitEnum UserLimit { get; set; }
 
+
+        /// <summary>
+        /// 钱钱
+        /// </summary>
+        public decimal Money { get; set; }
+
+
+        /// <summary>
+        /// 经验
+        /// </summary>
+        public long Experience { get; set; }
+
     }
 }