From 13ae0e33c175600be4933120456cedabc9ea2196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com>
Date: Thu, 1 Feb 2024 15:16:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/BbsUserInfoService.cs            | 25 +++++++----
 .../Managers/LevelManager.cs                  | 14 +++---
 Yi.Bbs.Vue3/src/apis/levelApi.js              |  7 +++
 Yi.Bbs.Vue3/src/views/level/Index.vue         | 45 ++++++++++++++-----
 4 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/BbsUserInfoService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/BbsUserInfoService.cs
index 50a92d5a..0e93ced2 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/BbsUserInfoService.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/BbsUserInfoService.cs
@@ -1,10 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
-using TencentCloud.Ame.V20190916.Models;
 using Volo.Abp.Application.Services;
 using Yi.Framework.Bbs.Application.Contracts.IServices;
 using Yi.Framework.Bbs.Domain.Managers;
-using Yi.Framework.Rbac.Domain.Shared.Dtos;
 
 namespace Yi.Framework.Bbs.Application.Services
 {
@@ -16,16 +14,25 @@ namespace Yi.Framework.Bbs.Application.Services
             _bbsUserManager = bbsUserManager;
         }
 
-        [HttpGet("bbs-user/{userName}")]
-        public async Task<BbsUserInfoDto> GetUserInfoByUserNameAsync([FromRoute][Required] string userName)
+        [HttpGet("bbs-user/{userNameOrUserId}")]
+        public async Task<BbsUserInfoDto> GetUserInfoByUserNameOrUserIdAsync([FromRoute][Required] string userNameOrUserId)
         {
-
-            var userEntity = await _bbsUserManager._userRepository.GetFirstAsync(x => x.UserName == userName);
-            if (userEntity == null)
+            Guid userId;
+            if (Guid.TryParse(userNameOrUserId, out var userGuidId))
             {
-                throw new Volo.Abp.UserFriendlyException("该用户不存在");
+                userId = userGuidId;
             }
-            var output =await _bbsUserManager.GetBbsUserInfoAsync(userEntity.Id);
+            else
+            {
+                var userEntity = await _bbsUserManager._userRepository.GetFirstAsync(x => x.UserName == userNameOrUserId);
+                if (userEntity == null)
+                {
+                    throw new Volo.Abp.UserFriendlyException("该用户不存在");
+                }
+                userId= userEntity.Id;
+            }
+
+            var output =await _bbsUserManager.GetBbsUserInfoAsync(userId);
 
             return output!;
         }
diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/LevelManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/LevelManager.cs
index 24fa1e6f..ba413bec 100644
--- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/LevelManager.cs
+++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/LevelManager.cs
@@ -36,11 +36,11 @@ namespace Yi.Framework.Bbs.Domain.Managers
             var currentNewExperience = userInfo.Experience + moneyNumber * 1;
 
             //修改钱钱，如果钱钱不足，直接会丢出去
-            await _localEventBus.PublishAsync(new MoneyChangeEventArgs { UserId = userId, Number = moneyNumber });
+            await _localEventBus.PublishAsync(new MoneyChangeEventArgs { UserId = userId, Number = -moneyNumber },false);
 
             //更改最终的经验再变化等级
-            var levelList = _levelCacheItem.OrderBy(x => x.CurrentLevel).ToList();
-            var currentNewLevel = 0;
+            var levelList = _levelCacheItem.OrderByDescending(x => x.CurrentLevel).ToList();
+            var currentNewLevel = 1;
             foreach (var level in levelList)
             {
                 if (currentNewExperience >= level.MinExperience)
@@ -49,9 +49,11 @@ namespace Yi.Framework.Bbs.Domain.Managers
                     break;
                 }
             }
-            userInfo.Level = currentNewLevel;
-            userInfo.Experience = currentNewExperience;
-            await _bbsUserManager._bbsUserInfoRepository.UpdateAsync(userInfo.Adapt<BbsUserExtraInfoEntity>());
+
+            var exUserInfo = await _bbsUserManager._bbsUserInfoRepository.GetAsync(x => x.UserId == userInfo.Id);
+            exUserInfo.Level = currentNewLevel;
+            exUserInfo.Experience = currentNewExperience;
+            await _bbsUserManager._bbsUserInfoRepository.UpdateAsync(exUserInfo);
 
         }
     }
diff --git a/Yi.Bbs.Vue3/src/apis/levelApi.js b/Yi.Bbs.Vue3/src/apis/levelApi.js
index b6237539..342a1e87 100644
--- a/Yi.Bbs.Vue3/src/apis/levelApi.js
+++ b/Yi.Bbs.Vue3/src/apis/levelApi.js
@@ -7,3 +7,10 @@ export function getList(data) {
     params: data,
   });
 }
+export function upgrade(experience) {
+  return request({
+    url: `/level/upgrade?experience=${experience}`,
+    method: "put"
+  });
+}
+
diff --git a/Yi.Bbs.Vue3/src/views/level/Index.vue b/Yi.Bbs.Vue3/src/views/level/Index.vue
index 14477740..9bc650cc 100644
--- a/Yi.Bbs.Vue3/src/views/level/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/level/Index.vue
@@ -1,24 +1,25 @@
 <template>
     <div class="container">
         <div class="top">
-        <h4>当前等级: 1-小白</h4>
-        <h4>当前钱钱: 100</h4>
+
+        <h4>当前等级: {{userInfo.level}}-{{ userInfo.levelName }}</h4>
+        <h4>当前钱钱: {{userInfo.money}}</h4>
         <div class="title">
             <div class="left">当前等级经验:</div>
             <div class="right"> 
-                <el-progress  :percentage="50" :stroke-width="15" striped  striped-flow />
-                <div>1623/2000</div>
+                <el-progress  :percentage="(userInfo.experience/nextExperience).toFixed(2)*100" :stroke-width="15" striped  striped-flow />
+                <div>{{userInfo.experience}}/{{ nextExperience }}</div>
             </div>
         </div>
       
         </div>
 
         <div class="bottom">
-            <el-input-number v-model="num" :min="1" :max="10000" />
+            <el-input-number v-model="moneyNum" :min="1" :max="10000" />
             
-            <el-button type="primary">升级</el-button>
+            <el-button @click="onUpgradeClick" type="primary">升级</el-button>
 
-            <span>所需钱钱：50</span>
+            <span>所需钱钱：{{ moneyNum }}</span>
         </div>
 
 
@@ -34,24 +35,48 @@
     
 </template>
 <script  setup>
-import {getList} from '@/apis/levelApi.js'
-import { ref,onMounted, reactive } from 'vue'
+import {getList,upgrade} from '@/apis/levelApi.js'
+import {getBbsUserProfile} from '@/apis/userApi.js'
+import { ref,onMounted, reactive,computed  } from 'vue'
+import  useAuths  from '@/hooks/useAuths.js';
+const { isLogin,currentUserInfo } = useAuths();
+const userInfo=ref({});
 
 const levelData =ref([]);
-const num=ref(1);
+const moneyNum=ref(1);
 
 const query=reactive({
     skipCount:0,
     maxResultCount:20
 })
+
+const nextExperience=computed(()=>{
+   return levelData.value?.filter(x=>x.currentLevel==userInfo.value.level+1)[0]?.minExperience
+})
+
+const onUpgradeClick=async ()=>{
+    await upgrade(moneyNum.value);
+    await loadLevelData();
+    await loadUserInfoData();
+}
+
 onMounted(async () => {
    await loadLevelData();
+await loadUserInfoData();
 })
 
 const loadLevelData=  async () => {
+    moneyNum.value=1;
    const {data:{items}} = await getList(query);
     levelData.value = items;
 }
+const loadUserInfoData=async()=>{
+    if(isLogin)
+   {
+        const {data}= await getBbsUserProfile(currentUserInfo.value.id);
+        userInfo.value=data;
+   }
+}
 </script>
 <style lang="scss" scoped >
 .container{