修复(#79): 合并internal并适配数量配价

Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
2026-05-27 01:14:32 -07:00
37 changed files with 1813 additions and 431 deletions
@@ -42,7 +42,7 @@ func (l *CreateRuleLogic) CreateRule(req *types.CreatePromoRuleRequest) (*types.
Type: req.Type,
Params: params,
Priority: req.Priority,
Enabled: &enabled,
Enabled: enabled,
StartTime: unixPtrToTimePtr(req.StartTime),
EndTime: unixPtrToTimePtr(req.EndTime),
}
+1 -5
View File
@@ -113,17 +113,13 @@ func convertRule(item *promomodel.Rule) types.PromoRule {
if item == nil {
return types.PromoRule{}
}
enabled := false
if item.Enabled != nil {
enabled = *item.Enabled
}
return types.PromoRule{
Id: item.Id,
Name: item.Name,
Type: item.Type,
Params: parseParams(item.Params),
Priority: item.Priority,
Enabled: enabled,
Enabled: item.Enabled,
StartTime: timePtrToUnixPtr(item.StartTime),
EndTime: timePtrToUnixPtr(item.EndTime),
CreatedAt: item.CreatedAt.Unix(),
@@ -37,10 +37,7 @@ func (l *UpdateRuleLogic) UpdateRule(req *types.UpdatePromoRuleRequest) (*types.
if err != nil {
return nil, err
}
enabled := true
if rule.Enabled != nil {
enabled = *rule.Enabled
}
enabled := rule.Enabled
if req.Enabled != nil {
enabled = *req.Enabled
}
@@ -48,7 +45,7 @@ func (l *UpdateRuleLogic) UpdateRule(req *types.UpdatePromoRuleRequest) (*types.
rule.Type = req.Type
rule.Params = params
rule.Priority = req.Priority
rule.Enabled = &enabled
rule.Enabled = enabled
rule.StartTime = unixPtrToTimePtr(req.StartTime)
rule.EndTime = unixPtrToTimePtr(req.EndTime)
if err := l.svcCtx.PromoModel.UpdateRule(l.ctx, rule); err != nil {