diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs b/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs
index 1943d23..3dc3cc2 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs
@@ -5,7 +5,7 @@ using HuanMeng.MiaoYu.Code.Users.UserAccount.Contract;
using HuanMeng.MiaoYu.Code.Users.UserAccount.PhoneAccount;
using HuanMeng.MiaoYu.Model.Dto;
using HuanMeng.MiaoYu.Model.Dto.Account;
-
+using HuanMeng.MiaoYu.Model.Dto.Character;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.Tokens;
@@ -16,6 +16,7 @@ using System.Linq;
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
+using static System.Net.Mime.MediaTypeNames;
namespace HuanMeng.MiaoYu.Code.Users
{
@@ -115,7 +116,13 @@ namespace HuanMeng.MiaoYu.Code.Users
UserId = user.Id,
Currency = userData.Currency,
UserIconUrl = userData.UserIconUrl,
- RemainingChatCount= 1
+ RemainingChatCount= 1,//这里先写1,我不会decimal转int
+ CharacterInfo = new CreateCharacterInfo
+ {
+ CharacterId =1,
+ CharacterName = "林婉儿",
+ BgImage= "https://cos.shhuanmeng.com/image/icon/%E6%9E%97%E5%A9%89%E5%84%BF.png"
+ }
});
}
}
diff --git a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs
index 0d6f08f..a5ce433 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Account/MyAccountInfoDto.cs
@@ -42,6 +42,11 @@ namespace HuanMeng.MiaoYu.Model.Dto.Account
///
public int Price { get; set; }
+ ///
+ /// 折扣 -0.1 -10%
+ ///
+ public string Discount { get;set; }
+
///
/// 金币类型
///
diff --git a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterSummary.cs b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterSummary.cs
index f1f7346..bcda8c6 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterSummary.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Model/Dto/Character/CharacterSummary.cs
@@ -49,4 +49,25 @@ namespace HuanMeng.MiaoYu.Model.Dto.Character
///
public List Label { get; set; }
}
+
+ ///
+ /// 创作中心:人物模型信息
+ ///
+ public class CreateCharacterInfo
+ {
+ ///
+ /// 人物id
+ ///
+ public int CharacterId { get; set; }
+
+ ///
+ /// 人物名字
+ ///
+ public string? CharacterName { get; set; }
+
+ ///
+ /// 背景图片
+ ///
+ public string BgImage { get; set; }
+ }
}
diff --git a/src/0-core/HuanMeng.MiaoYu.Model/Dto/ResponseUserInfo.cs b/src/0-core/HuanMeng.MiaoYu.Model/Dto/ResponseUserInfo.cs
index 1c79d2a..141eddb 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/Dto/ResponseUserInfo.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Model/Dto/ResponseUserInfo.cs
@@ -1,3 +1,4 @@
+using HuanMeng.MiaoYu.Model.Dto.Character;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -36,5 +37,10 @@ namespace HuanMeng.MiaoYu.Model.Dto
/// 聊天次数
///
public int RemainingChatCount { get; set; }
+
+ ///
+ /// 创作中心:人物模型信息
+ ///
+ public CreateCharacterInfo CharacterInfo { get; set; }
}
}
diff --git a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
index d35de06..f61766b 100644
--- a/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
+++ b/src/2-api/HuanMeng.MiaoYu.WebApi/Controllers/AccountController.cs
@@ -80,7 +80,7 @@ namespace HuanMeng.MiaoYu.WebApi.Controllers
[HttpGet]
public async Task> GetMyAccount()
{
- var obj = JsonConvert.DeserializeObject("{\"Currency\":1,\"CurrencyRechargeList\":[{\"Id\":0,\"CurrencyCount\":100,\"Price\":10,\"CurrencyType\":0,\"ImgUrl\":\"\"},{\"Id\":1,\"CurrencyCount\":200,\"Price\":20,\"CurrencyType\":0,\"ImgUrl\":\"\"}]}");
+ var obj = JsonConvert.DeserializeObject("{\"Currency\":1,\"CurrencyRechargeList\":[{\"Id\":0,\"CurrencyCount\":100,\"Price\":10,\"Discount\":\" 0%\",\"CurrencyType\":0,\"ImgUrl\":\"\"},{\"Id\":1,\"CurrencyCount\":200,\"Price\":20,\"Discount\":\" -10%\",\"CurrencyType\":0,\"ImgUrl\":\"\"}]}");
return new BaseResponse(ResonseCode.Success, "", obj);
}
}