diff --git a/src/CloudGaming/Code/CloudGaming.Code/Account/AccountBLL.cs b/src/CloudGaming/Code/CloudGaming.Code/Account/AccountBLL.cs index b9a564d..4229d9e 100644 --- a/src/CloudGaming/Code/CloudGaming.Code/Account/AccountBLL.cs +++ b/src/CloudGaming/Code/CloudGaming.Code/Account/AccountBLL.cs @@ -625,12 +625,12 @@ namespace CloudGaming.Code.Account }; if (ConsumeType == (int)UserCurrencyConsumeType.收入) { - userDiamondConsumeDto.ConsumeDetails = $"+ {it.Consume.ToString("0.##")}{((UserCurrencyType)it.CurrencyType).ToString()}"; + userDiamondConsumeDto.ConsumeDetails = $"+{it.Consume.ToString("0.##")}{((UserCurrencyType)it.CurrencyType).ToString()}"; userDiamondConsumeDto.DatePrompt = $"{it.CreateAt.ToString("yyyy-MM-dd HH:mm:ss")}"; } else { - userDiamondConsumeDto.ConsumeDetails = $"- {it.Consume.ToString("0.##")}{((UserCurrencyType)it.CurrencyType).ToString()}"; + userDiamondConsumeDto.ConsumeDetails = $"-{it.Consume.ToString("0.##")}{((UserCurrencyType)it.CurrencyType).ToString()}"; userDiamondConsumeDto.DatePrompt = $"{it.CreateAt.ToString("yyyy-MM-dd HH:mm:00")} 至 {it.UpdateAt.ToString("yyyy-MM-dd HH:mm:00")}"; } userDiamondConsumeDtos.Add(userDiamondConsumeDto); diff --git a/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs b/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs index ff35583..09b808c 100644 --- a/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs +++ b/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs @@ -297,7 +297,7 @@ namespace CloudGaming.Code.Account OrderCode = "", Title = "", UpdateAt = DateTime.Now, - UserId = cloudGamingBase.UserInfo.UserId + UserId = cloudGamingBase.UserInfo.UserId, }; if (userDoamondAction != null) { diff --git a/src/CloudGaming/Code/CloudGaming.Code/Aliyun/AlibabaIdCardVerify.cs b/src/CloudGaming/Code/CloudGaming.Code/Aliyun/AlibabaIdCardVerify.cs index 813e085..aab8c61 100644 --- a/src/CloudGaming/Code/CloudGaming.Code/Aliyun/AlibabaIdCardVerify.cs +++ b/src/CloudGaming/Code/CloudGaming.Code/Aliyun/AlibabaIdCardVerify.cs @@ -38,9 +38,9 @@ namespace CloudGaming.Code.Aliyun AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config { // 必填,请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。 - AccessKeyId = aliyunConfig.AccessKeyId, + AccessKeyId = "LTAI5tEMoHbcDC5d9CQWovJk",//aliyunOssConfig.AccessKeyId, //Environment.GetEnvironmentVariable("ALIBABA_CLOUD_ACCESS_KEY_ID"), // 必填,请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。 - AccessKeySecret = aliyunConfig.AccessKeySecret, + AccessKeySecret = "DgnYOJr0l9hTnl82vI4BxwVgtE1RdL"// aliyunOssConfig.AccessKeySecret, }; // Endpoint 请参考 https://api.aliyun.com/product/Cloudauth config.Endpoint = "cloudauth.aliyuncs.com"; diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs index 0ea0a99..7ac49ac 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/CloudGamingUserContext.cs @@ -255,7 +255,6 @@ public partial class CloudGamingUserContext : MultiTenantDbContext//DbContext entity.ToTable(tb => tb.HasComment("资产收入、支出表")); - entity.Property(e => e.Id).ValueGeneratedNever(); entity.Property(e => e.Consume) .HasComment("金额变化") .HasColumnType("decimal(18, 0)"); diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_DiamondList.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_DiamondList.cs index 620916a..c8e6aeb 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_DiamondList.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_DiamondList.cs @@ -55,4 +55,9 @@ public partial class T_User_DiamondList: MultiTenantEntity /// 扩展字段 /// public virtual string? Extend { get; set; } -} + + /// + /// 所属租户 + /// + public override Guid TenantId { get; set; } + } diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_LimitActionLog.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_LimitActionLog.cs index 283c594..4b5044d 100644 --- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_LimitActionLog.cs +++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_User/T_User_LimitActionLog.cs @@ -53,4 +53,9 @@ public partial class T_User_LimitActionLog: MultiTenantEntity /// 扩展字段 /// public virtual string? Extend1 { get; set; } -} + + /// + /// 所属租户 + /// + public override Guid TenantId { get; set; } + }