diff --git a/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs b/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs
index ebe94f2..d7d58fa 100644
--- a/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs
+++ b/src/0-core/HuanMeng.DotNetCore/MultiTenant/MultiTenantEntity.cs
@@ -16,7 +16,7 @@ namespace HuanMeng.DotNetCore.MultiTenant
///
/// 租户ID
///
- public Guid TenantId { get; set; }
+ public virtual Guid TenantId { get; set; }
}
}
diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs b/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs
index 38f0508..4baa36b 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Category/CategoryPageRegionExtend.cs
@@ -79,10 +79,7 @@ namespace HuanMeng.MiaoYu.Code.Category
var d = new DataListDto();
d.ActionType = RecommendActionTypeEnum.Chat.ToString();
d.ActionId = m.ActionId.ToString();
- if (int.TryParse(m.ActionId, out var x))
- {
- d.Id = x;
- }
+
d.ImageUrl = m.ImageUrl;//data.BgImage;
if (m.ActionType == RecommendActionTypeEnum.Chat.ToString())
{
@@ -91,6 +88,7 @@ namespace HuanMeng.MiaoYu.Code.Category
{
return;
}
+ d.Id = chatId;
var character = miaoYuCache.CharacterList.FirstOrDefault(it => it.Id == chatId);
if (character == null)
{
diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs b/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs
index 9be0117..a4509c2 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Users/UserBLL.cs
@@ -110,9 +110,9 @@ namespace HuanMeng.MiaoYu.Code.Users
var user = await Dao.daoDbMiaoYu.context.T_User.FirstOrDefaultAsync(it => it.Id == _UserId);
var userData = await Dao.daoDbMiaoYu.context.T_User_Data.FirstOrDefaultAsync(it => it.Id == _UserId);
//获取用户余额
- var Currency = user.GetUserCurrencyMoney(Model.EnumModel.User.UserCurrencyType.付费币, Dao);
- var RemainingChatCount = user.GetUserCurrencyMoney(Model.EnumModel.User.UserCurrencyType.聊天次数, Dao);
- var memoryCard = user.GetUserCurrencyMoney(Model.EnumModel.User.UserCurrencyType.记忆卡, Dao);
+ var Currency = user.GetUserCurrencyMoney(UserCurrencyType.付费币, Dao);
+ var RemainingChatCount = user.GetUserCurrencyMoney(UserCurrencyType.聊天次数, Dao);
+ var memoryCard = user.GetUserCurrencyMoney(UserCurrencyType.记忆卡, Dao);
//获取聊天次数
var hasTalked = Dao.daoDbMiaoYu.context.T_User_Chat.Where(it => it.UserId == _UserId && !it.IsDelete && it.TotalToken > 0).Count();
List characters = new List();
@@ -121,12 +121,11 @@ namespace HuanMeng.MiaoYu.Code.Users
NickName = user.NickName,
UserId = user.Id,
Currency = (int)Currency,
- UserIconUrl = userData.UserIconUrl,
+ UserIconUrl = string.IsNullOrEmpty(userData.UserIconUrl) ? "https://cos.shhuanmeng.com/default.png" : userData.UserIconUrl,
RemainingChatCount = (int)RemainingChatCount,//这里先写1,我不会decimal转int
HasTalked = hasTalked,
Photographs = 0,
-
- MemoryCardCount= (int)memoryCard,
+ MemoryCardCount = (int)memoryCard,
CharacterInfo = new List
{
//new CreateCharacterInfo
diff --git a/src/0-core/HuanMeng.MiaoYu.Model/CodeTemplates/EFCore/EntityType.t4 b/src/0-core/HuanMeng.MiaoYu.Model/CodeTemplates/EFCore/EntityType.t4
index 95e0191..90946ab 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/CodeTemplates/EFCore/EntityType.t4
+++ b/src/0-core/HuanMeng.MiaoYu.Model/CodeTemplates/EFCore/EntityType.t4
@@ -76,6 +76,12 @@ public partial class <#= EntityType.Name #>: MultiTenantEntity
}
if(property.Name=="TenantId"){
+ #>
+ ///
+ /// <#= code.XmlComment(property.GetComment(), indent: 1) #>
+ ///
+ public override Guid TenantId { get; set; }
+ <#
continue;
}
if (!string.IsNullOrEmpty(property.GetComment()))
diff --git a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs
index 4a354f6..7b1403a 100644
--- a/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Model/DbSqlServer/Db_MiaoYu/T_Character.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu;
@@ -7,6 +7,10 @@ namespace HuanMeng.MiaoYu.Model.DbSqlServer.Db_MiaoYu;
///
public partial class T_Character: MultiTenantEntity
{
+ ///
+ /// 租户
+ ///
+ public override Guid TenantId { get; set; }
///
/// 人物id
///