fix(package-series): 将 enable_one_time_commission 字段提升到创建/更新请求顶层
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 6m5s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 6m5s
- DTO: CreatePackageSeriesRequest 和 UpdatePackageSeriesRequest 添加 EnableOneTimeCommission 字段 - Service: Create/Update 方法处理顶层字段并同步到 JSON config 的 Enable 字段 - 确保顶层字段与 JSON config 内的 enable 保持一致,避免业务逻辑判断出错
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user