csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix(package-series): 将 enable_one_time_commission 字段提升到创建/更新请求顶层
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m5s
Details

Browse Source 
- DTO: CreatePackageSeriesRequest 和 UpdatePackageSeriesRequest 添加 EnableOneTimeCommission 字段
- Service: Create/Update 方法处理顶层字段并同步到 JSON config 的 Enable 字段
- 确保顶层字段与 JSON config 内的 enable 保持一致，避免业务逻辑判断出错
This commit is contained in:
huang
2026-02-04 14:38:10 +08:00
parent b18ecfeb55
commit dc84cef2ce
3 changed files with 91 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/dto/package_series_dto.go
View File

@@ -28,6 +28,7 @@ type CreatePackageSeriesRequest struct {
SeriesCode string `json:"series_code" validate:"required,min=1,max=100" required:"true" minLength:"1" maxLength:"100" description:"系列编码"`
SeriesName string `json:"series_name" validate:"required,min=1,max=255" required:"true" minLength:"1" maxLength:"255" description:"系列名称"`
Description string `json:"description" validate:"omitempty,max=500" maxLength:"500" description:"描述"`
EnableOneTimeCommission *bool `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
OneTimeCommissionConfig *SeriesOneTimeCommissionConfigDTO `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金规则配置"`
}
@@ -35,6 +36,7 @@ type CreatePackageSeriesRequest struct {
type UpdatePackageSeriesRequest struct {
SeriesName *string `json:"series_name" validate:"omitempty,min=1,max=255" minLength:"1" maxLength:"255" description:"系列名称"`
Description *string `json:"description" validate:"omitempty,max=500" maxLength:"500" description:"描述"`
EnableOneTimeCommission *bool `json:"enable_one_time_commission" description:"是否启用一次性佣金"`
OneTimeCommissionConfig *SeriesOneTimeCommissionConfigDTO `json:"one_time_commission_config" validate:"omitempty" description:"一次性佣金规则配置"`
}

23
internal/service/package_series/service.go
View File

@@ -43,8 +43,18 @@ func (s *Service) Create(ctx context.Context, req *dto.CreatePackageSeriesReques
}
series.Creator = currentUserID
if req.EnableOneTimeCommission != nil {
series.EnableOneTimeCommission = *req.EnableOneTimeCommission
}
if req.OneTimeCommissionConfig != nil {
config := s.dtoToModelConfig(req.OneTimeCommissionConfig)
config.Enable = series.EnableOneTimeCommission
if err := series.SetOneTimeCommissionConfig(config); err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "设置一次性佣金配置失败")
}
} else if series.EnableOneTimeCommission {
config := &model.OneTimeCommissionConfig{Enable: true}
if err := series.SetOneTimeCommissionConfig(config); err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "设置一次性佣金配置失败")
}
@@ -88,11 +98,24 @@ func (s *Service) Update(ctx context.Context, id uint, req *dto.UpdatePackageSer
if req.Description != nil {
series.Description = *req.Description
}
if req.EnableOneTimeCommission != nil {
series.EnableOneTimeCommission = *req.EnableOneTimeCommission
}
if req.OneTimeCommissionConfig != nil {
config := s.dtoToModelConfig(req.OneTimeCommissionConfig)
config.Enable = series.EnableOneTimeCommission
if err := series.SetOneTimeCommissionConfig(config); err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "设置一次性佣金配置失败")
}
} else if req.EnableOneTimeCommission != nil {
existingConfig, _ := series.GetOneTimeCommissionConfig()
if existingConfig == nil {
existingConfig = &model.OneTimeCommissionConfig{}
}
existingConfig.Enable = series.EnableOneTimeCommission
if err := series.SetOneTimeCommissionConfig(existingConfig); err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "设置一次性佣金配置失败")
}
}
series.Updater = currentUserID