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

Co-authored-by: multica-agent <github@multica.ai>

internal/logic/admin/application/deleteSubscribeApplicationLogic.go

@@ -29,7 +29,7 @@ func (l *DeleteSubscribeApplicationLogic) DeleteSubscribeApplication(req *types.
 	err := l.svcCtx.ClientModel.Delete(l.ctx, req.Id)
 	if err != nil {
 		l.Errorf("Failed to delete subscribe application with ID %d: %v", req.Id, err)
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error())
+		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error())
 	}
 	return nil
 }

internal/logic/admin/promo/createRuleLogic.go

@@ -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),
 	}

internal/logic/admin/promo/tool.go

@@ -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(),

internal/logic/admin/promo/updateRuleLogic.go

@@ -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 {

internal/logic/admin/server/resetSortWithNodeLogic.go

@@ -80,7 +80,7 @@ func (l *ResetSortWithNodeLogic) ResetSortWithNode(req *types.ResetSortRequest)
 	})
 	if err != nil {
 		l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
+		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
 	}
 	return nil
 }

internal/logic/admin/server/resetSortWithServerLogic.go

@@ -80,7 +80,7 @@ func (l *ResetSortWithServerLogic) ResetSortWithServer(req *types.ResetSortReque
 	})
 	if err != nil {
 		l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
+		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
 	}
 	return nil
 }