refactor: 重构资产实体和DTO结构类型
将gjson.Json类型替换为具体的结构体和map类型,修正DAO层链式调用,启用SKU元数据校验逻辑
This commit is contained in:
@@ -82,8 +82,8 @@ func (s *asset) GetOne(ctx context.Context, req *dto.GetAssetReq) (res *dto.GetA
|
||||
if assetOne, err = dao.Asset.GetOne(ctx, req); err != nil {
|
||||
return
|
||||
}
|
||||
var assetListItem *dto.AssetItem
|
||||
if err = gconv.Struct(assetOne, assetListItem); err != nil {
|
||||
var assetListItem *entity.Asset
|
||||
if err = gconv.Struct(assetOne, &assetListItem); err != nil {
|
||||
return
|
||||
}
|
||||
getCategoryRes, err := dao.Category.GetOne(ctx, &dto.GetCategoryReq{
|
||||
@@ -93,7 +93,7 @@ func (s *asset) GetOne(ctx context.Context, req *dto.GetAssetReq) (res *dto.GetA
|
||||
return
|
||||
}
|
||||
return &dto.GetAssetRes{
|
||||
AssetItem: assetListItem,
|
||||
Asset: assetListItem,
|
||||
CategoryName: getCategoryRes.Name,
|
||||
ImgAddressPrefix: minio.GetFileAddressPrefix(ctx),
|
||||
}, nil
|
||||
@@ -109,7 +109,7 @@ func (s *asset) GetAssetAndSku(ctx context.Context, req *dto.GetAssetAndSkuReq)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
var assetListItem *dto.AssetItem
|
||||
var assetListItem *entity.Asset
|
||||
if err = gconv.Struct(assetOne, assetListItem); err != nil {
|
||||
return
|
||||
}
|
||||
@@ -126,7 +126,7 @@ func (s *asset) GetAssetAndSku(ctx context.Context, req *dto.GetAssetAndSkuReq)
|
||||
return
|
||||
}
|
||||
return &dto.GetAssetAndSkuRes{
|
||||
AssetItem: assetListItem,
|
||||
Asset: assetListItem,
|
||||
Skus: assetSkuListResItem,
|
||||
TenantModuleType: moduleType.Options,
|
||||
ImgAddressPrefix: minio.GetFileAddressPrefix(ctx),
|
||||
|
||||
Reference in New Issue
Block a user