add f

2026-01-09 15:58:09 +08:00
parent bd76520d22
commit ead5f17b7c
18 changed files with 1175 additions and 121 deletions
--- a/internal/application/product/product_application_service_impl.go
+++ b/internal/application/product/product_application_service_impl.go
@@ -50,7 +50,7 @@ func NewProductApplicationService(
 }

 // CreateProduct 创建产品
-// 业务流程<EFBFBD>?. 构建产品实体 2. 创建产品
+// 业务流程：1. 构建产品实体 2. 创建产品
 func (s *ProductApplicationServiceImpl) CreateProduct(ctx context.Context, cmd *commands.CreateProductCommand) (*responses.ProductAdminInfoResponse, error) {
 	// 1. 构建产品实体
 	product := &entities.Product{
@@ -59,6 +59,7 @@ func (s *ProductApplicationServiceImpl) CreateProduct(ctx context.Context, cmd *
 		Description:      cmd.Description,
 		Content:          cmd.Content,
 		CategoryID:       cmd.CategoryID,
+		SubCategoryID:    cmd.SubCategoryID,
 		Price:            decimal.NewFromFloat(cmd.Price),
 		CostPrice:        decimal.NewFromFloat(cmd.CostPrice),
 		Remark:           cmd.Remark,
@@ -97,6 +98,7 @@ func (s *ProductApplicationServiceImpl) UpdateProduct(ctx context.Context, cmd *
 	existingProduct.Description = cmd.Description
 	existingProduct.Content = cmd.Content
 	existingProduct.CategoryID = cmd.CategoryID
+	existingProduct.SubCategoryID = cmd.SubCategoryID
 	existingProduct.Price = decimal.NewFromFloat(cmd.Price)
 	existingProduct.CostPrice = decimal.NewFromFloat(cmd.CostPrice)
 	existingProduct.Remark = cmd.Remark
@@ -490,30 +492,36 @@ func (s *ProductApplicationServiceImpl) GetProductByIDForUser(ctx context.Contex
 // convertToProductInfoResponse 转换为产品信息响应
 func (s *ProductApplicationServiceImpl) convertToProductInfoResponse(product *entities.Product) *responses.ProductInfoResponse {
 	response := &responses.ProductInfoResponse{
-		ID:               product.ID,
-		OldID:            product.OldID,
-		Name:             product.Name,
-		Code:             product.Code,
-		Description:      product.Description,
-		Content:          product.Content,
-		CategoryID:       product.CategoryID,
-		Price:            product.Price.InexactFloat64(),
-		IsEnabled:        product.IsEnabled,
-		IsPackage:        product.IsPackage,
-		SellUIComponent:  product.SellUIComponent,
+		ID:              product.ID,
+		OldID:           product.OldID,
+		Name:            product.Name,
+		Code:            product.Code,
+		Description:     product.Description,
+		Content:         product.Content,
+		CategoryID:      product.CategoryID,
+		SubCategoryID:   product.SubCategoryID,
+		Price:           product.Price.InexactFloat64(),
+		IsEnabled:       product.IsEnabled,
+		IsPackage:       product.IsPackage,
+		SellUIComponent: product.SellUIComponent,
 		UIComponentPrice: product.UIComponentPrice.InexactFloat64(),
-		SEOTitle:         product.SEOTitle,
-		SEODescription:   product.SEODescription,
-		SEOKeywords:      product.SEOKeywords,
-		CreatedAt:        product.CreatedAt,
-		UpdatedAt:        product.UpdatedAt,
+		SEOTitle:        product.SEOTitle,
+		SEODescription:  product.SEODescription,
+		SEOKeywords:     product.SEOKeywords,
+		CreatedAt:       product.CreatedAt,
+		UpdatedAt:       product.UpdatedAt,
 	}

-	// 添加分类信息
+	// 添加一级分类信息
 	if product.Category != nil {
 		response.Category = s.convertToCategoryInfoResponse(product.Category)
 	}

+	// 添加二级分类信息
+	if product.SubCategory != nil {
+		response.SubCategory = s.convertToSubCategoryInfoResponse(product.SubCategory)
+	}
+
 	// 转换组合包项目信息
 	if product.IsPackage && len(product.PackageItems) > 0 {
 		response.PackageItems = make([]*responses.PackageItemResponse, len(product.PackageItems))
@@ -536,33 +544,39 @@ func (s *ProductApplicationServiceImpl) convertToProductInfoResponse(product *en
 // convertToProductAdminInfoResponse 转换为管理员产品信息响应
 func (s *ProductApplicationServiceImpl) convertToProductAdminInfoResponse(product *entities.Product) *responses.ProductAdminInfoResponse {
 	response := &responses.ProductAdminInfoResponse{
-		ID:               product.ID,
-		OldID:            product.OldID,
-		Name:             product.Name,
-		Code:             product.Code,
-		Description:      product.Description,
-		Content:          product.Content,
-		CategoryID:       product.CategoryID,
-		Price:            product.Price.InexactFloat64(),
-		CostPrice:        product.CostPrice.InexactFloat64(),
-		Remark:           product.Remark,
-		IsEnabled:        product.IsEnabled,
-		IsVisible:        product.IsVisible, // 管理员可以看到可见状态
-		IsPackage:        product.IsPackage,
-		SellUIComponent:  product.SellUIComponent,
+		ID:              product.ID,
+		OldID:           product.OldID,
+		Name:            product.Name,
+		Code:            product.Code,
+		Description:     product.Description,
+		Content:         product.Content,
+		CategoryID:      product.CategoryID,
+		SubCategoryID:   product.SubCategoryID,
+		Price:           product.Price.InexactFloat64(),
+		CostPrice:       product.CostPrice.InexactFloat64(),
+		Remark:          product.Remark,
+		IsEnabled:       product.IsEnabled,
+		IsVisible:       product.IsVisible, // 管理员可以看到可见状态
+		IsPackage:       product.IsPackage,
+		SellUIComponent: product.SellUIComponent,
 		UIComponentPrice: product.UIComponentPrice.InexactFloat64(),
-		SEOTitle:         product.SEOTitle,
-		SEODescription:   product.SEODescription,
-		SEOKeywords:      product.SEOKeywords,
-		CreatedAt:        product.CreatedAt,
-		UpdatedAt:        product.UpdatedAt,
+		SEOTitle:        product.SEOTitle,
+		SEODescription:  product.SEODescription,
+		SEOKeywords:     product.SEOKeywords,
+		CreatedAt:       product.CreatedAt,
+		UpdatedAt:       product.UpdatedAt,
 	}

-	// 添加分类信息
+	// 添加一级分类信息
 	if product.Category != nil {
 		response.Category = s.convertToCategoryInfoResponse(product.Category)
 	}

+	// 添加二级分类信息
+	if product.SubCategory != nil {
+		response.SubCategory = s.convertToSubCategoryInfoResponse(product.SubCategory)
+	}
+
 	// 转换组合包项目信息
 	if product.IsPackage && len(product.PackageItems) > 0 {
 		response.PackageItems = make([]*responses.PackageItemResponse, len(product.PackageItems))
@@ -594,6 +608,28 @@ func (s *ProductApplicationServiceImpl) convertToCategoryInfoResponse(category *
 	}
 }

+func (s *ProductApplicationServiceImpl) convertToSubCategoryInfoResponse(subCategory *entities.ProductSubCategory) *responses.SubCategoryInfoResponse {
+	response := &responses.SubCategoryInfoResponse{
+		ID:          subCategory.ID,
+		Name:        subCategory.Name,
+		Code:        subCategory.Code,
+		Description: subCategory.Description,
+		CategoryID:  subCategory.CategoryID,
+		Sort:        subCategory.Sort,
+		IsEnabled:   subCategory.IsEnabled,
+		IsVisible:   subCategory.IsVisible,
+		CreatedAt:   subCategory.CreatedAt,
+		UpdatedAt:   subCategory.UpdatedAt,
+	}
+
+	// 添加一级分类信息
+	if subCategory.Category != nil {
+		response.Category = s.convertToCategoryInfoResponse(subCategory.Category)
+	}
+
+	return response
+}
+
 // GetProductApiConfig 获取产品API配置
 func (s *ProductApplicationServiceImpl) GetProductApiConfig(ctx context.Context, productID string) (*responses.ProductApiConfigResponse, error) {
 	return s.productApiConfigAppService.GetProductApiConfig(ctx, productID)