glz/QYZH.InteractiveMagazine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 新增宠物进化分组接口、OSS图片搬运功能及配置更新

Browse Source 
1. 新增皮肤按进化阶段分组的输出DTO
2. 新增宠物相关便捷查询接口并实现对应控制器
3. 新增OSS图片搬运辅助类，实现临时文件迁移逻辑
4. 为商品、宠物相关服务添加OSS图片自动迁移功能
5. 调整微信授权同步逻辑移除异步等待
6. 更新配置文件中的微信密钥和OSS存储信息
7. 注册SDK服务到DI容器
This commit is contained in:
glz
2026-06-09 18:02:26 +08:00
parent badf68a8f8
commit 296d87b245
9 changed files with 421 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
QYZH.InteractiveMagazine.Service/PetService.cs
View File

@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using QYZH.InteractiveMagazine.Infrastructure.OSS;
using QYZH.InteractiveMagazine.IService;
using QYZH.InteractiveMagazine.Models.Common;
using QYZH.InteractiveMagazine.Models.Dto;
@ -20,9 +21,11 @@ public class PetService(
BaseRepository<PetEvolution> petEvolutionRepository,
BaseRepository<PetSkinImage> petSkinImageRepository,
BaseRepository<PetSkin> petSkinRepository,
OssService ossService,
ILogger<PetService> logger)
: BaseRepository<UserPet>, IPetService
{
private OssImageHelper CreateImageHelper() => new(ossService, logger);
/// <summary>
/// 获取用户宠物信息（含当前形态名称、皮肤图片序列）
/// </summary>
@ -442,6 +445,8 @@ public class PetService(
// 3. 为该阶段创建默认皮肤图片
if (evoInput.Images != null && evoInput.Images.Count > 0)
{
var helper = CreateImageHelper();
foreach (var imgInput in evoInput.Images.OrderBy(i => i.SortOrder))
{
var skinImage = new PetSkinImage
@ -460,6 +465,14 @@ public class PetService(
await petSkinImageRepository.InsertAsync(skinImage);
// 搬运图片到正式目录
if (OssImageHelper.IsTempImage(skinImage.ImageUrl))
{
skinImage.ImageUrl = await helper.MoveToFormalAsync(
skinImage.ImageUrl, $"pet/template/{template.Id}/stage/{evolution.Id}");
await petSkinImageRepository.UpdateAsync(skinImage);
}
// 记录初始阶段的封面图
if (previousEvolution == null
&& imgInput.Type == PetSkinImageTypeEnum.Cover.ToString()
@ -850,6 +863,14 @@ public class PetService(
if (!result)
throw new BusinessException("创建皮肤失败", 500);
// 搬运封面图到正式目录
if (OssImageHelper.IsTempImage(skin.CoverImageUrl))
{
var helper = CreateImageHelper();
skin.CoverImageUrl = await helper.MoveToFormalAsync(skin.CoverImageUrl, $"pet/skin/{skin.Id}");
await petSkinRepository.UpdateAsync(skin);
}
logger.LogInformation("创建皮肤成功，Id: {Id}, Name: {Name}", skin.Id, skin.Name);
return BuildSkinOutput(skin, null);
}
@ -872,7 +893,16 @@ public class PetService(
skin.Rarity = input.Rarity;
skin.SortOrder = input.SortOrder;
skin.Type = Enum.Parse<PetSkinTypeEnum>(input.Type, true);
skin.CoverImageUrl = input.CoverImageUrl;
// 搬运封面图到正式目录
var newCoverUrl = input.CoverImageUrl;
if (OssImageHelper.IsTempImage(newCoverUrl))
{
var helper = CreateImageHelper();
newCoverUrl = await helper.MoveToFormalAsync(newCoverUrl, $"pet/skin/{skin.Id}");
}
skin.CoverImageUrl = newCoverUrl;
skin.UpdatedBy = "System";
skin.UpdatedAt = DateTime.Now;
@ -1045,6 +1075,14 @@ public class PetService(
if (!result)
throw new BusinessException("创建皮肤图片失败", 500);
// 搬运图片到正式目录
if (OssImageHelper.IsTempImage(image.ImageUrl))
{
var helper = CreateImageHelper();
image.ImageUrl = await helper.MoveToFormalAsync(image.ImageUrl, $"pet/skinimage/{image.Id}");
await petSkinImageRepository.UpdateAsync(image);
}
logger.LogInformation("创建皮肤图片成功，Id: {Id}, SkinId: {SkinId}", image.Id, image.SkinId);
return BuildSkinImageOutput(image);
}
@ -1063,7 +1101,16 @@ public class PetService(
image.SkinId = input.SkinId;
image.EvolutionStageId = input.EvolutionStageId;
image.ImageUrl = input.ImageUrl.Trim();
// 搬运图片到正式目录
var newImageUrl = input.ImageUrl.Trim();
if (OssImageHelper.IsTempImage(newImageUrl))
{
var helper = CreateImageHelper();
newImageUrl = await helper.MoveToFormalAsync(newImageUrl, $"pet/skinimage/{image.Id}");
}
image.ImageUrl = newImageUrl;
image.SortOrder = input.SortOrder;
image.Type = Enum.Parse<PetSkinImageTypeEnum>(input.Type, true);
image.UpdatedBy = "System";
@ -1123,4 +1170,115 @@ public class PetService(
UpdatedAt = i.UpdatedAt
};
}
// ==================== 便捷查询接口 ====================
/// <summary>
/// 根据模板Id获取进化链列表（非分页，按StageLevel排序）
/// </summary>
public async Task<List<PetEvolutionOutput>> GetEvolutionsByTemplateIdAsync(long templateId)
{
if (templateId <= 0)
throw new BusinessException("模板Id不能为空", 400);
var list = await petEvolutionRepository.Queryable()
.Where(e => e.TemplateId == templateId && !e.IsDeleted)
.OrderBy(e => e.StageLevel)
.ToListAsync();
return list.Select(BuildEvolutionOutput).ToList();
}
/// <summary>
/// 根据模板Id获取皮肤列表（非分页，按SortOrder排序）
/// </summary>
public async Task<List<PetSkinOutput>> GetSkinsByTemplateIdAsync(long templateId)
{
if (templateId <= 0)
throw new BusinessException("模板Id不能为空", 400);
var list = await petSkinRepository.Queryable()
.Where(s => s.TemplateId == templateId && !s.IsDeleted)
.OrderBy(s => s.SortOrder)
.ToListAsync();
var result = list.Select(s => new PetSkinOutput
{
Id = s.Id,
TemplateId = s.TemplateId,
Name = s.Name,
Description = s.Description,
Rarity = s.Rarity,
SortOrder = s.SortOrder,
Type = s.Type.ToString(),
CoverImageUrl = s.CoverImageUrl,
CreatedBy = s.CreatedBy,
CreatedAt = s.CreatedAt,
UpdatedBy = s.UpdatedBy,
UpdatedAt = s.UpdatedAt
}).ToList();
// 批量查询关联图片
var skinIds = result.Select(s => s.Id).ToList();
if (skinIds.Count > 0)
{
var allImages = await petSkinImageRepository.Queryable()
.Where(i => skinIds.Contains(i.SkinId) && !i.IsDeleted)
.OrderBy(i => i.SortOrder)
.ToListAsync();
var imageMap = allImages
.GroupBy(i => i.SkinId)
.ToDictionary(g => g.Key, g => g.Select(BuildSkinImageOutput).ToList());
foreach (var skin in result)
{
if (imageMap.ContainsKey(skin.Id))
skin.Images = imageMap[skin.Id];
}
}
return result;
}
/// <summary>
/// 根据皮肤Id获取各阶段图片列表（按进化阶段分组，含阶段基本信息）
/// </summary>
public async Task<List<SkinEvolutionStageOutput>> GetSkinImagesGroupedBySkinIdAsync(long skinId)
{
if (skinId <= 0)
throw new BusinessException("皮肤Id不能为空", 400);
// 1. 获取皮肤信息
var skin = await petSkinRepository.GetByIdAsync(skinId);
if (skin == null || skin.IsDeleted)
throw new BusinessException("皮肤不存在", 404);
// 2. 获取该模板的所有进化阶段（按阶段等级排序）
var evolutions = await petEvolutionRepository.Queryable()
.Where(e => e.TemplateId == skin.TemplateId && !e.IsDeleted)
.OrderBy(e => e.StageLevel)
.ToListAsync();
// 3. 获取该皮肤的所有图片
var images = await petSkinImageRepository.Queryable()
.Where(i => i.SkinId == skinId && !i.IsDeleted)
.OrderBy(i => i.SortOrder)
.ToListAsync();
var imagesByStage = images
.GroupBy(i => i.EvolutionStageId)
.ToDictionary(g => g.Key, g => g.Select(BuildSkinImageOutput).ToList());
// 4. 组装结果：每个进化阶段 + 对应的图片列表
return evolutions.Select(e => new SkinEvolutionStageOutput
{
EvolutionId = e.Id,
StageName = e.StageName,
StageLevel = e.StageLevel,
RequiredGrowth = e.RequiredGrowth,
PreviousEvolutionId = e.PreviousEvolutionId,
Images = imagesByStage.GetValueOrDefault(e.Id, new List<PetSkinImageOutput>())
}).ToList();
}
}

44
QYZH.InteractiveMagazine.Service/ProductService.cs
View File

@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using QYZH.InteractiveMagazine.Infrastructure.OSS;
using QYZH.InteractiveMagazine.IService;
using QYZH.InteractiveMagazine.Models.Common;
using QYZH.InteractiveMagazine.Models.Dto;
@ -12,7 +13,10 @@ namespace QYZH.InteractiveMagazine.Service;
/// <summary>
/// 商品服务实现
/// </summary>
public class ProductService(BaseRepository<Product> productRepository, ILogger<ProductService> logger) : BaseRepository<Product>, IProductService
public class ProductService(
BaseRepository<Product> productRepository,
OssService ossService,
ILogger<ProductService> logger) : BaseRepository<Product>, IProductService
{
/// <summary>
@ -62,6 +66,16 @@ public class ProductService(BaseRepository<Product> productRepository, ILogger<P
throw new BusinessException("创建商品失败", 500);
}
// 将 temp 目录下的图片搬运到正式目录
if (OssImageHelper.IsTempImage(product.ImageUrl))
{
var helper = CreateImageHelper();
var folder = GetProductFormalFolder(product.Type, product.Id);
var formalPath = await helper.MoveToFormalAsync(product.ImageUrl, folder);
product.ImageUrl = formalPath;
await productRepository.UpdateAsync(product);
}
logger.LogInformation("商品创建成功，商品名称: {Name}, ID: {Id}", input.Name, product.Id);
return new ProductOutput
@ -112,9 +126,18 @@ public class ProductService(BaseRepository<Product> productRepository, ILogger<P
throw new BusinessException("商品价格不能为负数", 400);
}
// 将 temp 目录下的新图片搬运到正式目录
var newImageUrl = input.ImageUrl;
if (OssImageHelper.IsTempImage(newImageUrl))
{
var helper = CreateImageHelper();
var folder = GetProductFormalFolder(Enum.Parse<ProductTypeEnum>(input.Type, true), product.Id);
newImageUrl = await helper.MoveToFormalAsync(newImageUrl, folder);
}
product.Name = input.Name.Trim();
product.Description = input.Description;
product.ImageUrl = input.ImageUrl;
product.ImageUrl = newImageUrl;
product.Price = input.Price;
product.Type = Enum.Parse<ProductTypeEnum>(input.Type, true);
product.Status = (int)input.Status;
@ -284,4 +307,21 @@ public class ProductService(BaseRepository<Product> productRepository, ILogger<P
logger.LogInformation("商品上下架状态更新成功，ID: {Id}, SaleStatus: {SaleStatus}", id, product.Status);
}
#region OSS 图片搬运
private OssImageHelper CreateImageHelper() => new(ossService, logger);
private static string GetProductFormalFolder(ProductTypeEnum type, long productId)
{
var typeFolder = type switch
{
ProductTypeEnum.MakeUpCard => "makeupcard",
ProductTypeEnum.PetSkin => "petskin",
_ => "other"
};
return $"product/{typeFolder}/{productId}";
}
#endregion
}

2
QYZH.InteractiveMagazine.Service/WeChatAuthService.cs
View File

@ -77,7 +77,7 @@ public class WeChatAuthService(BaseRepository<Users> usersRepository, IConfigura
IsLastOnline = true
};
var insertResult = await usersRepository.Insertable(newUser).ExecuteReturnIdentityAsync();
var insertResult = usersRepository.Insertable(newUser).ExecuteReturnIdentity();
if (insertResult <= 0)
{
logger.LogError("创建微信用户失败，OpenId: {OpenId}", wxResponse.OpenId);