From 9e136bbd6b85ca56e83ee45fb7827ecdf2e0d98c Mon Sep 17 00:00:00 2001 From: Mrx <18278715334@163.com> Date: Wed, 27 May 2026 13:10:00 +0800 Subject: [PATCH] f --- internal/domains/api/dto/api_request_dto.go | 18 +++++++++--------- .../processors/qygl/qygl2ysb_processor.go | 2 +- .../processors/qygl/qygl3ysb_processor.go | 2 +- .../processors/qygl/qygl4yab_processor.go | 2 +- .../services/product_management_service.go | 19 ++----------------- .../product/gorm_product_repository.go | 2 +- 6 files changed, 15 insertions(+), 30 deletions(-) diff --git a/internal/domains/api/dto/api_request_dto.go b/internal/domains/api/dto/api_request_dto.go index c3fca07..4fcbbbc 100644 --- a/internal/domains/api/dto/api_request_dto.go +++ b/internal/domains/api/dto/api_request_dto.go @@ -489,21 +489,21 @@ type IVYZ2A8BReq struct { } type QYGL4YABReq struct { - EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` - EntCode string `json:"ent_code" validate:"required,validUSCI"` - IDCard string `json:"id_card" validate:"required,validIDCard"` - Name string `json:"name" validate:"required,min=1,validName"` + EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` + LegalPerson string `json:"legal_person" validate:"required,min=1,validName"` + EntCode string `json:"ent_code" validate:"required,validUSCI"` + IDCard string `json:"id_card" validate:"required,validIDCard"` } type QYGL3YSBReq struct { - Name string `json:"name" validate:"required,min=1,validName"` - EntCode string `json:"ent_code" validate:"required,validUSCI"` - EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` + EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` + LegalPerson string `json:"legal_person" validate:"required,min=1,validName"` + EntCode string `json:"ent_code" validate:"required,validUSCI"` } type QYGL2YSBReq struct { - EntCode string `json:"ent_code" validate:"required,validUSCI"` - Name string `json:"name" validate:"required,min=1,validName"` + LegalPerson string `json:"legal_person" validate:"required,min=1,validName"` + EntCode string `json:"ent_code" validate:"required,validUSCI"` } type IVYZ7C9DReq struct { diff --git a/internal/domains/api/services/processors/qygl/qygl2ysb_processor.go b/internal/domains/api/services/processors/qygl/qygl2ysb_processor.go index d293abd..d4e6df7 100644 --- a/internal/domains/api/services/processors/qygl/qygl2ysb_processor.go +++ b/internal/domains/api/services/processors/qygl/qygl2ysb_processor.go @@ -21,7 +21,7 @@ func ProcessQYGL2YSBRequest(ctx context.Context, params []byte, deps *processors return nil, errors.Join(processors.ErrInvalidParam, err) } reqFormData := map[string]interface{}{ - "legalPerson": paramsDto.Name, + "legalPerson": paramsDto.LegalPerson, "creditNo": paramsDto.EntCode, } apiPath := "/v4/company/two/check" // 接口路径，根据数脉文档填写（如 v4/xxx） diff --git a/internal/domains/api/services/processors/qygl/qygl3ysb_processor.go b/internal/domains/api/services/processors/qygl/qygl3ysb_processor.go index b8bd31f..81ecf4a 100644 --- a/internal/domains/api/services/processors/qygl/qygl3ysb_processor.go +++ b/internal/domains/api/services/processors/qygl/qygl3ysb_processor.go @@ -21,7 +21,7 @@ func ProcessQYGL3YSBRequest(ctx context.Context, params []byte, deps *processors return nil, errors.Join(processors.ErrInvalidParam, err) } reqFormData := map[string]interface{}{ - "legalPerson": paramsDto.Name, + "legalPerson": paramsDto.LegalPerson, "companyName": paramsDto.EntName, "creditNo": paramsDto.EntCode, } diff --git a/internal/domains/api/services/processors/qygl/qygl4yab_processor.go b/internal/domains/api/services/processors/qygl/qygl4yab_processor.go index d5ecd5d..f905f3b 100644 --- a/internal/domains/api/services/processors/qygl/qygl4yab_processor.go +++ b/internal/domains/api/services/processors/qygl/qygl4yab_processor.go @@ -22,7 +22,7 @@ func ProcessQYGL4YABRequest(ctx context.Context, params []byte, deps *processors } reqFormData := map[string]interface{}{ "idCard": paramsDto.IDCard, - "legalPerson": paramsDto.Name, + "legalPerson": paramsDto.LegalPerson, "companyName": paramsDto.EntName, "creditNo": paramsDto.EntCode, } diff --git a/internal/domains/product/services/product_management_service.go b/internal/domains/product/services/product_management_service.go index 37fccbc..a9cbc2e 100644 --- a/internal/domains/product/services/product_management_service.go +++ b/internal/domains/product/services/product_management_service.go @@ -449,8 +449,8 @@ func (s *ProductManagementService) GetAllProductsForDictionary(ctx context.Conte options := interfaces.ListOptions{ Page: 1, - PageSize: 1000, // 获取所有产品 - Sort: "sort", // 使用 products 表的 sort 字段，排序后再按分类分组 + PageSize: 1000, // 获取所有产品 + Sort: "category.sort", // 按分类的排序字段排序 Order: "asc", } @@ -461,20 +461,5 @@ func (s *ProductManagementService) GetAllProductsForDictionary(ctx context.Conte return nil, fmt.Errorf("获取产品字典数据失败: %w", err) } - // 预加载分类信息 - for _, product := range products { - if product.CategoryID != "" { - category, _ := s.categoryRepo.GetByID(ctx, product.CategoryID) - product.Category = &category - } - - if product.SubCategoryID != nil && *product.SubCategoryID != "" { - subCategory, err := s.subCategoryRepo.GetByID(ctx, *product.SubCategoryID) - if err == nil && subCategory != nil { - product.SubCategory = subCategory - } - } - } - return products, nil } diff --git a/internal/infrastructure/database/repositories/product/gorm_product_repository.go b/internal/infrastructure/database/repositories/product/gorm_product_repository.go index c72a074..c4f824b 100644 --- a/internal/infrastructure/database/repositories/product/gorm_product_repository.go +++ b/internal/infrastructure/database/repositories/product/gorm_product_repository.go @@ -205,7 +205,7 @@ func (r *GormProductRepository) ListProducts(ctx context.Context, query *queries } // 预加载分类信息并获取数据 - if err := dbQuery.Preload("Category").Find(&productEntities).Error; err != nil { + if err := dbQuery.Preload("Category").Preload("SubCategory").Find(&productEntities).Error; err != nil { return nil, 0, err }