云库增加 AI识图,缓存,我的云库收藏增加安全标志
调用外部API 扣费
This commit is contained in:
1 parent
7c29e57623
commit
150e8644b7
49 files changed
+1069
-28
No files matched your search
@@ -1,11 +1,14 @@
|
||||
using MAX.Core.DependencyInjection;
|
||||
using MAX.Framework.Commons;
|
||||
using MAX.Framework.Dtos;
|
||||
using MAX.Framework.Validation;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Store.Modules.CloudProduct.Dtos;
|
||||
using Store.Modules.CloudProduct.Entities;
|
||||
using Store.Modules.CloudProduct.Enums;
|
||||
using Store.Modules.CloudProduct.Repositorys;
|
||||
using Store.Users.Contracts;
|
||||
using System.Globalization;
|
||||
|
||||
namespace Store.Modules.CloudProduct.Services
|
||||
{
|
||||
@@ -17,6 +20,9 @@ namespace Store.Modules.CloudProduct.Services
|
||||
/// <summary>批量收藏商品,返回本次成功收藏的商品数量(已收藏的商品视为修改收藏分组)</summary>
|
||||
Task<int> AddFavoritesAsync(AddUserFavoriteRequest request);
|
||||
|
||||
/// <summary>按用户和商品编号更新已存在的收藏记录。</summary>
|
||||
Task SaveProductSafetyAsync(SaveProductSafetyRequest request);
|
||||
|
||||
/// <summary>批量取消收藏,返回实际取消的条数</summary>
|
||||
Task<int> RemoveFavoritesAsync(RemoveUserFavoritesRequest request);
|
||||
|
||||
@@ -47,6 +53,8 @@ namespace Store.Modules.CloudProduct.Services
|
||||
private readonly UserGoodsFavoriteRepository _favoriteRepository;
|
||||
private readonly UserGoodsFavoriteGroupRepository _groupRepository;
|
||||
private readonly GoodsRepository _goodsRepository;
|
||||
private readonly IUserQueryService _queryService;
|
||||
private readonly GoodsIndexLock _indexLock;
|
||||
private readonly IUserFavoritesIndexService _indexService;
|
||||
private readonly ILogger<UserFavoritesService> _logger;
|
||||
|
||||
@@ -54,13 +62,16 @@ namespace Store.Modules.CloudProduct.Services
|
||||
UserGoodsFavoriteRepository favoriteRepository,
|
||||
UserGoodsFavoriteGroupRepository groupRepository,
|
||||
GoodsRepository goodsRepository,
|
||||
IUserQueryService queryService,
|
||||
IUserFavoritesIndexService indexService,
|
||||
ILogger<UserFavoritesService> logger)
|
||||
ILogger<UserFavoritesService> logger, GoodsIndexLock indexLock)
|
||||
{
|
||||
_favoriteRepository = favoriteRepository;
|
||||
_groupRepository = groupRepository;
|
||||
_goodsRepository = goodsRepository;
|
||||
_queryService = queryService;
|
||||
_indexService = indexService;
|
||||
_indexLock = indexLock;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
@@ -81,6 +92,8 @@ namespace Store.Modules.CloudProduct.Services
|
||||
{
|
||||
throw new AppException("用户名不能为空", ResultCode.ValidationError);
|
||||
}
|
||||
var mainUser = await _queryService.GetMainUser(userName);
|
||||
userName = mainUser.UserName;
|
||||
|
||||
var goodsIds = request.GoodsIds?.Where(x => x > 0).Distinct().ToList() ?? new List<long>();
|
||||
if (goodsIds.Count == 0)
|
||||
@@ -93,6 +106,7 @@ namespace Store.Modules.CloudProduct.Services
|
||||
throw new AppException("收藏分组无效", ResultCode.ValidationError);
|
||||
}
|
||||
|
||||
await using var lease = await _indexLock.AcquireFavoritesAsync();
|
||||
// 1. 校验分组归属(分组ID > 0 时必须是该用户自己创建的分组)
|
||||
if (request.GroupId > 0)
|
||||
{
|
||||
@@ -206,6 +220,28 @@ namespace Store.Modules.CloudProduct.Services
|
||||
return documents.Count;
|
||||
}
|
||||
|
||||
/// <summary>仅修改安全字段,避免覆盖同时发生的收藏分组变更。</summary>
|
||||
public async Task SaveProductSafetyAsync(SaveProductSafetyRequest request)
|
||||
{
|
||||
RequestValidator.Validate(request);
|
||||
if (!long.TryParse(request.ProductId, NumberStyles.None, CultureInfo.InvariantCulture, out var goodsId) || goodsId <= 0)
|
||||
throw new AppException("商品编号必须是正整数", ResultCode.ValidationError);
|
||||
|
||||
var userName = request.UserName.Trim();
|
||||
await using var lease = await _indexLock.AcquireFavoritesAsync();
|
||||
using var work = _favoriteRepository.Orm.CreateUnitOfWork();
|
||||
work.GetOrBeginTransaction();
|
||||
var favorite = await work.Orm.Select<UserGoodsFavoriteEntity>()
|
||||
.Where(x => x.UserName == userName && x.GoodsId == goodsId).FirstAsync()
|
||||
?? throw new AppException("该用户尚未收藏此商品", ResultCode.NotFound);
|
||||
|
||||
await work.Orm.Update<UserGoodsFavoriteEntity>().Set(x => x.IsSafe, request.IsSafe)
|
||||
.Where(x => x.Id == favorite.Id).ExecuteAffrowsAsync();
|
||||
// 重复上报也同步索引,索引明确失败时由工作单元回滚数据库。
|
||||
await _indexService.UpdateSafetyAsync(UserFavoritesSearchDocument.BuildId(favorite.UserName, goodsId), request.IsSafe!.Value);
|
||||
work.Commit();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 批量取消收藏:先删除数据库记录,再删除索引文档;
|
||||
/// 索引删除失败时回补数据库记录,避免“库里有收藏但搜索不到”。
|
||||
@@ -229,6 +265,7 @@ namespace Store.Modules.CloudProduct.Services
|
||||
throw new AppException("请提供要取消收藏的商品编号", ResultCode.ValidationError);
|
||||
}
|
||||
|
||||
await using var lease = await _indexLock.AcquireFavoritesAsync();
|
||||
var favorites = await _favoriteRepository.Select
|
||||
.Where(x => x.UserName == userName && goodsIds.Contains(x.GoodsId))
|
||||
.ToListAsync();
|
||||
@@ -404,8 +441,8 @@ namespace Store.Modules.CloudProduct.Services
|
||||
{
|
||||
throw new AppException("用户名不能为空", ResultCode.ValidationError);
|
||||
}
|
||||
|
||||
request.UserName = userName;
|
||||
var mainUser = await _queryService.GetMainUser(userName);
|
||||
request.UserName = mainUser.UserName;
|
||||
|
||||
var searchResult = await _indexService.SearchAsync(request, ParseSortBy(request.SortBy));
|
||||
var list = searchResult.Documents.Select(ToItem).ToList();
|
||||
@@ -417,6 +454,7 @@ namespace Store.Modules.CloudProduct.Services
|
||||
/// </summary>
|
||||
public async Task<long> RebuildSearchIndexAsync()
|
||||
{
|
||||
await using var lease = await _indexLock.AcquireFavoritesAsync();
|
||||
// 1. 删除并重建索引(清空所有用户收藏索引)
|
||||
await _indexService.ClearIndexAsync();
|
||||
|
||||
@@ -546,6 +584,7 @@ namespace Store.Modules.CloudProduct.Services
|
||||
{
|
||||
Id = UserFavoritesSearchDocument.BuildId(favorite.UserName, favorite.GoodsId),
|
||||
FavId = favorite.Id,
|
||||
IsSafe = favorite.IsSafe,
|
||||
UserName = favorite.UserName,
|
||||
GroupId = favorite.GroupId,
|
||||
GroupName = groupName,
|
||||
@@ -568,6 +607,7 @@ namespace Store.Modules.CloudProduct.Services
|
||||
return new UserFavoriteItem
|
||||
{
|
||||
Id = document.FavId,
|
||||
IsSafe = document.IsSafe,
|
||||
UserName = document.UserName,
|
||||
GroupId = document.GroupId,
|
||||
GroupName = document.GroupName,
|
||||
|
||||
Reference in new issue
Block a user