server/CloudGaming
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加消息功能

Browse Source
This commit is contained in:
zpc 2024-11-20 17:10:07 +08:00
parent d264b11b79
commit 95fb90dc31
13 changed files with 571 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/CloudGaming/Api/CloudGaming.Api/Controllers/MessagesController.cs Normal file
View File

@ -0,0 +1,78 @@
using CloudGaming.Api.Base;
using CloudGaming.Code.DataAccess;
using CloudGaming.Code.Other;
using CloudGaming.DtoModel.Messages;
using HuanMeng.DotNetCore.Base;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
namespace CloudGaming.Api.Controllers;
/// <summary>
/// 消息
/// </summary>
public class MessagesController : CloudGamingControllerBase
{
public MessagesController(IServiceProvider _serviceProvider) : base(_serviceProvider)
{
}
/// <summary>
/// 获取用户消息列表
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<List<MessageListDto>> GetUserMessageList()
{
MessagesBLL messagesBLL = new MessagesBLL(ServiceProvider);
return await messagesBLL.GetUserMessageList();
}
/// <summary>
/// 获取消息详情，获取详情后会自动已读
/// </summary>
/// <param name="messageId"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageListDto> GetUserMessageInfo([FromQuery] int messageId)
{
MessagesBLL messagesBLL = new MessagesBLL(ServiceProvider);
return await messagesBLL.GetUserMessageInfo(messageId);
}
/// <summary>
/// 用户消息读取
/// </summary>
/// <param name="messageId"></param>
/// <returns></returns>
[HttpPost]
public async Task<bool> UserMessageRead([FromBody] UserMessageRequest userMessageRequest)
{
MessagesBLL messagesBLL = new MessagesBLL(ServiceProvider);
return await messagesBLL.UserMessageRead(userMessageRequest.MessageId);
}
/// <summary>
/// 全部已读
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<bool> UserAllMessageRead()
{
MessagesBLL messagesBLL = new MessagesBLL(ServiceProvider);
return await messagesBLL.UserAllMessageRead();
}
/// <summary>
/// 获取未读取消息的数量
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<int> GetUserMessageNotReadCount()
{
MessagesBLL messagesBLL = new MessagesBLL(ServiceProvider);
return await messagesBLL.GetUserMessageNotReadCount();
}
}

4
src/CloudGaming/Code/CloudGaming.Code/Account/AccountBLL.cs
View File

@ -530,7 +530,9 @@ namespace CloudGaming.Code.Account
UserId = _UserId,
Ip = HttpContextAccessor.HttpContext.GetClientIpAddress()
};
await this.UserConsumeDiamondMoneyAsync(10, "实名认证赠送");
await this.UserConsumeDiamondMoneyAsync(UserCurrencyType.钻石, 10, "实名认证赠送");
await this.SendUserMessageAsync("实名认证赠送",$"实名认证成功!您已获得钻石*{10}");
await Dao.DaoUser.Context.T_User_LimitActionLog.AddAsync(limitActionLog);
await Dao.DaoUser.Context.SaveChangesAsync();
return "奖励已经发送，钻石*10";

52
src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs
View File

@ -4,9 +4,11 @@ using CloudGaming.Code.Account.Contract;
using CloudGaming.Code.Account.Login;
using CloudGaming.Code.Account.UserCurrency;
using CloudGaming.Code.DataAccess;
using CloudGaming.Code.Other;
using CloudGaming.DtoModel.Account.Login;
using CloudGaming.DtoModel.Account.User;
using CloudGaming.DtoModel.Account.User.Cache;
using CloudGaming.DtoModel.Messages;
using HuanMeng.DotNetCore.Redis;
@ -326,10 +328,58 @@ namespace CloudGaming.Code.Account
public static async Task<bool> UserConsumeDiamondMoneyAsync(this CloudGamingBase cloudGamingBase, decimal money, string title = "", string orderId = "")
{
return await UserConsumeDiamondMoneyAsync(cloudGamingBase, money, it => { it.Title = title; it.OrderCode = orderId; });
}
/// <summary>
///
/// </summary>
/// <param name="cloudGamingBase"></param>
/// <param name="money">金额</param>
/// <param name="title">资产支出标题</param>
/// <param name="orderId">订单号</param>
/// <returns></returns>
public static async Task<bool> UserConsumeDiamondMoneyAsync(this CloudGamingBase cloudGamingBase, UserCurrencyType userCurrencyType, decimal money, string title = "", string orderId = "")
{
if (userCurrencyType == UserCurrencyType.钻石)
{
return await UserConsumeDiamondMoneyAsync(cloudGamingBase, money, it => { it.Title = title; it.OrderCode = orderId; });
}
return await UserConsumeDiamondMoneyAsync(cloudGamingBase, money, it => { it.Title = title; it.OrderCode = orderId; });
}
/// <summary>
/// 发送消息
/// </summary>
/// <param name="cloudGamingBase"></param>
/// <param name="title"></param>
/// <param name="content"></param>
/// <returns></returns>
public static async Task<bool> SendUserMessageAsync(this CloudGamingBase cloudGamingBase, string title, string content)
{
if (cloudGamingBase._UserId == 0)
{
return false;
}
T_User_Messages t_User_Messages = new T_User_Messages()
{
Content = content,
CreateAt = DateTime.Now,
MessageType = MessageType.user.ToString(),
IsRead = false,
SendAt = DateTime.Now,
SystemId = 0,
Title = title,
UserId = cloudGamingBase._UserId
};
await cloudGamingBase.Dao.DaoPhone.Context.T_User_Messages.AddAsync(t_User_Messages);
await cloudGamingBase.Dao.DaoPhone.Context.SaveChangesAsync();
return true;
}
/// <summary>
/// 扣除当前用户钻石
/// </summary>

4
src/CloudGaming/Code/CloudGaming.Code/Cache/CloudGamingCache.cs
View File

@ -261,7 +261,7 @@ namespace CloudGaming.Code.Cache
/// <summary>
/// 获取实体缓存
/// </summary>
public static CommonDataEntityCache<T> GetDataEntityCache<T>(CloudGamingBase cloudGamingBase, Expression<Func<T, bool>>? expWhere = null) where T : class
public static CommonDataEntityCache<T> GetDataEntityCache<T>(CloudGamingBase cloudGamingBase, Expression<Func<T, bool>>? expWhere = null, int cacheTime =36000) where T : class
{
var typeLock = typeof(T);
var namespaceKey = typeLock.Namespace;
@ -275,7 +275,7 @@ namespace CloudGaming.Code.Cache
object cacheLock = GetOrAddCacheLock(typeLock, cacheList);
CacheBaseConfig cacheBaseConfig = cloudGamingBase.ToCacheBaseConfig(dbType);
return new DataBaseEntityCache<T>(cacheBaseConfig, cacheLock, expWhere: expWhere);
return new DataBaseEntityCache<T>(cacheBaseConfig, cacheLock, expWhere: expWhere, cacheTime: cacheTime);
}
/// <summary>

181
src/CloudGaming/Code/CloudGaming.Code/Other/MessagesBLL.cs Normal file
View File

@ -0,0 +1,181 @@
using CloudGaming.Code.Cache;
using CloudGaming.Code.DataAccess;
using CloudGaming.DtoModel.Messages;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static SKIT.FlurlHttpClient.Wechat.TenpayV3.Models.CreateNewTaxControlFapiaoApplicationRequest.Types.Fapiao.Types;
namespace CloudGaming.Code.Other;
/// <summary>
/// 消息
/// </summary>
public class MessagesBLL : CloudGamingBase
{
public MessagesBLL(IServiceProvider serviceProvider) : base(serviceProvider)
{
}
/// <summary>
/// 给用户发送消息
/// </summary>
/// <param name="userId"></param>
/// <param name="title"></param>
/// <param name="content"></param>
/// <returns></returns>
public async Task SendUserMessage(int userId, string title, string content)
{
T_User_Messages t_User_Messages = new T_User_Messages()
{
Content = content,
CreateAt = DateTime.Now,
MessageType = MessageType.user.ToString(),
IsRead = false,
SendAt = DateTime.Now,
SystemId = 0,
Title = title,
UserId = userId
};
await Dao.DaoPhone.Context.T_User_Messages.AddAsync(t_User_Messages);
await Dao.DaoPhone.Context.SaveChangesAsync();
}
/// <summary>
/// 获取用户消息列表
/// </summary>
/// <returns></returns>
public async Task<List<MessageListDto>> GetUserMessageList()
{
List<MessageListDto> messageListDtos = new List<MessageListDto>();
if (_UserId == 0)
{
return messageListDtos;
}
await InitSystemMessage();
var list = await Dao.DaoPhone.Context.T_User_Messages.AsNoTracking().Where(it => it.UserId == _UserId).OrderBy(it => it.IsRead).ThenByDescending(it => it.SendAt).Take(100).ToListAsync();
list.ForEach(it =>
{
MessageListDto messageListDto = new MessageListDto()
{
Content = it.Content,
MessageId = it.Id,
SendDateTime = it.SendAt.ToString("yyyy-MM-dd"),
Title = it.Title,
IsRead = it.IsRead,
};
if (messageListDto.Content.Length > 20)
{
messageListDto.Content = messageListDto.Content[..20] + "...";
}
messageListDtos.Add(messageListDto);
});
return messageListDtos;
}
/// <summary>
/// 获取消息详情
/// </summary>
/// <param name="messageId"></param>
/// <returns></returns>
public async Task<MessageListDto> GetUserMessageInfo(int messageId)
{
var userMessages = await Dao.DaoPhone.Context.T_User_Messages.Where(it => it.UserId == _UserId && it.Id == messageId).FirstOrDefaultAsync();
if (userMessages == null)
{
throw MessageBox.ErrorShow("消息不存在");
}
userMessages.IsRead = true;
userMessages.ReadAt = DateTime.Now;
await Dao.DaoPhone.Context.SaveChangesAsync();
MessageListDto messageListDto = new MessageListDto()
{
Content = userMessages.Content,
IsRead = userMessages.IsRead,
MessageId = messageId,
SendDateTime = userMessages.SendAt.ToString("yyyy-MM-dd HH:mm:ss")
};
return messageListDto;
}
/// <summary>
/// 用户消息读取
/// </summary>
/// <param name="messageId"></param>
/// <returns></returns>
public async Task<bool> UserMessageRead(int messageId)
{
var userMessages = await Dao.DaoPhone.Context.T_User_Messages.Where(it => it.UserId == _UserId && it.Id == messageId).FirstOrDefaultAsync();
if (userMessages == null)
{
throw MessageBox.ErrorShow("消息不存在");
}
userMessages.ReadAt = DateTime.Now;
userMessages.IsRead = true;
await Dao.DaoPhone.Context.SaveChangesAsync();
return true;
}
/// <summary>
/// 全部已读
/// </summary>
/// <returns></returns>
public async Task<bool> UserAllMessageRead()
{
var userMessages = await Dao.DaoPhone.Context.T_User_Messages.Where(it => it.UserId == _UserId && !it.IsRead).ToListAsync();
userMessages.ForEach(item =>
{
item.IsRead = true;
item.ReadAt = DateTime.Now;
});
await Dao.DaoPhone.Context.SaveChangesAsync();
return true;
}
/// <summary>
/// 获取未读取消息的数量
/// </summary>
/// <returns></returns>
public async Task<int> GetUserMessageNotReadCount()
{
if (_UserId == 0)
{
return 0;
}
await InitSystemMessage();
var coun = await Dao.DaoPhone.Context.T_User_Messages.Where(it => it.UserId == _UserId && !it.IsRead).CountAsync();
return coun;
}
/// <summary>
/// 初始话系统消息
/// </summary>
/// <returns></returns>
private async Task InitSystemMessage()
{
var systemIds = Dao.DaoPhone.Context.T_User_Messages.Where(it => it.UserId == _UserId && it.MessageType == MessageType.system.ToString()).Select(it => it.SystemId).ToList();
var sysMessage = await Dao.DaoPhone.Context.T_Sys_Message.Where(it => !systemIds.Contains(it.Id)).ToListAsync();
if (sysMessage != null && sysMessage.Count > 0)
{
sysMessage.ForEach(item =>
{
T_User_Messages t_User_Messages = new T_User_Messages()
{
Content = item.Content,
CreateAt = item.CreatedAt,
MessageType = MessageType.system.ToString(),
IsRead = false,
SendAt = item.CreatedAt,
SystemId = item.Id,
Title = item.Title,
UserId = _UserId
};
Dao.DaoPhone.Context.T_User_Messages.Add(t_User_Messages);
});
await Dao.DaoPhone.Context.SaveChangesAsync();
}
}
}

12
src/CloudGaming/Code/CloudGaming.Code/Other/RedemptionBLL.cs
View File

@ -81,7 +81,7 @@ namespace CloudGaming.Code.Other
string m = await SendReward(code, red);
return new BaseResponse<bool>(ResonseCode.Success, m, true) { };
}
private async Task<string> SendReward(string code, RedemptionCodeCache? red)
{
T_User_RedemptionUsage t_User_RedemptionUsage = new T_User_RedemptionUsage()
@ -94,14 +94,13 @@ namespace CloudGaming.Code.Other
};
await Dao.DaoPhone.Context.T_User_RedemptionUsage.AddAsync(t_User_RedemptionUsage);
await Dao.DaoPhone.Context.SaveChangesAsync();
var msg = "领取成功！";
var msg = "兑换码领取成功！";
//发放奖励
if (red.RewardConfigs != null && red.RewardConfigs.Count > 0)
{
foreach (var raw in red.RewardConfigs)
{
var isSuccess = await this.UserConsumeDiamondMoneyAsync(raw.AwardNum, $"兑换码礼包");
var isSuccess = await this.UserConsumeDiamondMoneyAsync((UserCurrencyType)raw.CurrencyType, raw.AwardNum, $"兑换码礼包");
if (!isSuccess)
{
t_User_RedemptionUsage.Status = (int)RedemptionUsageStatus.领取失败;
@ -113,8 +112,11 @@ namespace CloudGaming.Code.Other
await Dao.DaoPhone.Context.SaveChangesAsync();
throw MessageBox.Show(ResonseCode.Error, "奖励发放失败");
}
msg += $"获得{(UserCurrencyType)raw.CurrencyType}*{raw.AwardNum}";
msg += $"获得{(UserCurrencyType)raw.CurrencyType}*{raw.AwardNum}，";
}
msg = msg.TrimEnd('，');
msg += "。";
await this.SendUserMessageAsync("兑换码领取成功！", msg);
t_User_RedemptionUsage.Remarks = msg;
if (t_User_RedemptionUsage.Remarks.Length > 250)
{

8
src/CloudGaming/Code/CloudGaming.Code/Other/SevenSignBLL.cs
View File

@ -104,15 +104,17 @@ public class SevenSignBLL : CloudGamingBase
{
foreach (var raw in sevenRaw)
{
var isSuccess = await this.UserConsumeDiamondMoneyAsync(raw.AwardNum, $"七天签到-第{userSevenInfo.ConsecutiveSignDays + 1}天礼包");
var isSuccess = await this.UserConsumeDiamondMoneyAsync((UserCurrencyType)raw.CurrencyType, raw.AwardNum, $"七天签到-第{userSevenInfo.ConsecutiveSignDays + 1}天礼包");
if (!isSuccess)
{
throw MessageBox.Show(ResonseCode.Error, "奖励发放失败");
}
msg += $"获得{(UserCurrencyType)raw.CurrencyType}*{raw.AwardNum}";
msg += $"获得{(UserCurrencyType)raw.CurrencyType}*{raw.AwardNum}，";
}
msg = msg.TrimEnd('，');
msg += "。";
await this.SendUserMessageAsync("七天签到奖励", msg);
}
T_User_SignDays t_User_SignDays = new T_User_SignDays()
{

39
src/CloudGaming/Model/CloudGaming.DtoModel/Messages/MessageListDto.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CloudGaming.DtoModel.Messages
{
/// <summary>
///
/// </summary>
public class MessageListDto
{
/// <summary>
/// 消息id
/// </summary>
public int MessageId { get; set; }
/// <summary>
/// 标题
/// </summary>
public string Title { get; set; }
/// <summary>
/// 内容
/// </summary>
public string Content { get; set; }
/// <summary>
/// 消息发送时间
/// </summary>
public string SendDateTime { get; set; }
/// <summary>
/// 已读，未读
/// </summary>
public bool IsRead { get; set; }
}
}

22
src/CloudGaming/Model/CloudGaming.DtoModel/Messages/MessageType.cs Normal file
View File

@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CloudGaming.DtoModel.Messages;
/// <summary>
/// 消息类型
/// </summary>
public enum MessageType
{
/// <summary>
/// 系统消息
/// </summary>
system,
/// <summary>
/// 用户消息
/// </summary>
user
}

19
src/CloudGaming/Model/CloudGaming.DtoModel/Messages/UserMessageRequest.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CloudGaming.DtoModel.Messages
{
/// <summary>
///
/// </summary>
public class UserMessageRequest
{
/// <summary>
/// 消息Id
/// </summary>
public int MessageId { get; set; }
}
}

65
src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/CloudGamingPhoneContext.cs
View File

@ -153,6 +153,11 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
/// </summary>
public virtual DbSet<T_SysMessage> T_SysMessage { get; set; }
/// <summary>
/// 系统消息表
/// </summary>
public virtual DbSet<T_Sys_Message> T_Sys_Message { get; set; }
/// <summary>
/// 位置大小类型列表
/// </summary>
@ -173,6 +178,11 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
/// </summary>
public virtual DbSet<T_User_GameList> T_User_GameList { get; set; }
/// <summary>
/// 用户消息表
/// </summary>
public virtual DbSet<T_User_Messages> T_User_Messages { get; set; }
/// <summary>
/// 用户游玩时间表，总表，一个游戏一条数据
/// </summary>
@ -1028,6 +1038,27 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
}
});
modelBuilder.Entity<T_Sys_Message>(entity =>
{
entity.HasKey(e => e.Id).HasName("PK__T_Sys_Me__3214EC073AAC025D");
entity.ToTable(tb => tb.HasComment("系统消息表"));
entity.Property(e => e.Content).HasComment("消息内容");
entity.Property(e => e.CreatedAt)
.HasComment("消息创建时间")
.HasColumnType("datetime");
entity.Property(e => e.TenantId).HasComment("租户");
entity.Property(e => e.Title)
.HasMaxLength(50)
.HasComment("标题");
//添加全局筛选器
if (this.TenantInfo != null)
{
entity.HasQueryFilter(it => it.TenantId == this.TenantInfo.TenantId);
}
});
modelBuilder.Entity<T_UITypes>(entity =>
{
entity.HasKey(e => e.Id).HasName("PK_T_UITYPES");
@ -1131,6 +1162,40 @@ public partial class CloudGamingPhoneContext : MultiTenantDbContext//DbContext
}
});
modelBuilder.Entity<T_User_Messages>(entity =>
{
entity.HasKey(e => e.Id).HasName("PK__T_User_M__3214EC07ECFD5286");
entity.ToTable(tb => tb.HasComment("用户消息表"));
entity.Property(e => e.Id).HasComment("主键");
entity.Property(e => e.Content).HasComment("消息内容");
entity.Property(e => e.CreateAt)
.HasComment("创建时间")
.HasColumnType("datetime");
entity.Property(e => e.IsRead).HasComment("是否已读");
entity.Property(e => e.MessageType)
.HasMaxLength(10)
.HasComment("消息类型");
entity.Property(e => e.ReadAt)
.HasComment("已读时间")
.HasColumnType("datetime");
entity.Property(e => e.SendAt)
.HasComment("消息发送时间")
.HasColumnType("datetime");
entity.Property(e => e.SystemId).HasComment("系统消息Id");
entity.Property(e => e.TenantId).HasComment("租户");
entity.Property(e => e.Title)
.HasMaxLength(100)
.HasComment("消息标题");
entity.Property(e => e.UserId).HasComment("对应用户的Id");
//添加全局筛选器
if (this.TenantInfo != null)
{
entity.HasQueryFilter(it => it.TenantId == this.TenantInfo.TenantId);
}
});
modelBuilder.Entity<T_User_PlayGameTime>(entity =>
{
entity.HasKey(e => e.Id).HasName("PK__T_User_P__3214EC07D35C08FA");

33
src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_Sys_Message.cs Normal file
View File

@ -0,0 +1,33 @@
using System;
namespace CloudGaming.Model.DbSqlServer.Db_Phone;
/// <summary>
/// 系统消息表
/// </summary>
public partial class T_Sys_Message: MultiTenantEntity
{
public T_Sys_Message() { }
public virtual int Id { get; set; }
/// <summary>
/// 标题
/// </summary>
public virtual string Title { get; set; } = null!;
/// <summary>
/// 消息内容
/// </summary>
public virtual string Content { get; set; } = null!;
/// <summary>
/// 消息创建时间
/// </summary>
public virtual DateTime CreatedAt { get; set; }
/// <summary>
/// 所属租户
/// </summary>
public override Guid TenantId { get; set; }
}

66
src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_User_Messages.cs Normal file
View File

@ -0,0 +1,66 @@
using System;
namespace CloudGaming.Model.DbSqlServer.Db_Phone;
/// <summary>
/// 用户消息表
/// </summary>
public partial class T_User_Messages: MultiTenantEntity
{
public T_User_Messages() { }
/// <summary>
/// 主键
/// </summary>
public virtual int Id { get; set; }
/// <summary>
/// 对应用户的Id
/// </summary>
public virtual int UserId { get; set; }
/// <summary>
/// 所属租户
/// </summary>
public override Guid TenantId { get; set; }
/// <summary>
/// 消息类型
/// </summary>
public virtual string MessageType { get; set; } = null!;
/// <summary>
/// 消息标题
/// </summary>
public virtual string Title { get; set; } = null!;
/// <summary>
/// 消息内容
/// </summary>
public virtual string Content { get; set; } = null!;
/// <summary>
/// 是否已读
/// </summary>
public virtual bool IsRead { get; set; }
/// <summary>
/// 已读时间
/// </summary>
public virtual DateTime? ReadAt { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public virtual DateTime CreateAt { get; set; }
/// <summary>
/// 系统消息Id
/// </summary>
public virtual int SystemId { get; set; }
/// <summary>
/// 消息发送时间
/// </summary>
public virtual DateTime SendAt { get; set; }
}