收口审计治理与套餐任务进展

Constraint: 在线热修前必须保存当前迭代分支全部有效代码进展
Confidence: medium
Scope-risk: broad
Directive: 后续修改需保持审计事件与业务事务边界一致
Tested: git diff --cached --check
Not-tested: 未运行全量测试，提交用于切换分支前保存既有工作

internal/service/shop_commission/service.go

@@ -7,6 +7,7 @@ import (
 	"math/rand"
 	"time"
 
+	"github.com/break/junhong_cmp_fiber/internal/infrastructure/audit"
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
 	"github.com/break/junhong_cmp_fiber/internal/store"
@@ -28,9 +29,15 @@ type Service struct {
 	commissionRecordStore            *postgres.CommissionRecordStore
 	agentWalletTransactionStore      *postgres.AgentWalletTransactionStore
 	db                               *gorm.DB
+	auditWriter                      *audit.Writer
 	logger                           *zap.Logger
 }
 
+// SetAuditWriter 注入佣金与提现统一审计 Writer。
+func (s *Service) SetAuditWriter(writer *audit.Writer) {
+	s.auditWriter = writer
+}
+
 // New 创建代理商资金管理服务
 func New(
 	shopStore *postgres.ShopStore,
@@ -460,7 +467,20 @@ func (s *Service) CreateWithdrawalRequest(ctx context.Context, shopID uint, req
 	}
 	accountInfoJSON, _ := json.Marshal(accountInfo)
 
-	var withdrawalRequest *model.CommissionWithdrawalRequest
+	withdrawalRequest := &model.CommissionWithdrawalRequest{
+		WithdrawalNo:     withdrawalNo,
+		ShopID:           shopID,
+		ApplicantID:      currentUserID,
+		Amount:           req.Amount,
+		FeeRate:          setting.FeeRate,
+		Fee:              fee,
+		ActualAmount:     actualAmount,
+		WithdrawalMethod: req.WithdrawalMethod,
+		AccountInfo:      accountInfoJSON,
+		Status:           constants.WithdrawalStatusPending,
+	}
+	withdrawalRequest.Creator = currentUserID
+	withdrawalRequest.Updater = currentUserID
 
 	err = s.db.Transaction(func(tx *gorm.DB) error {
 		// 使用条件更新防并发
@@ -476,21 +496,6 @@ func (s *Service) CreateWithdrawalRequest(ctx context.Context, shopID uint, req
 			return errors.New(errors.CodeInsufficientBalance, "余额不足或并发冲突，请稍后重试")
 		}
 
-		withdrawalRequest = &model.CommissionWithdrawalRequest{
-			WithdrawalNo:     withdrawalNo,
-			ShopID:           shopID,
-			ApplicantID:      currentUserID,
-			Amount:           req.Amount,
-			FeeRate:          setting.FeeRate,
-			Fee:              fee,
-			ActualAmount:     actualAmount,
-			WithdrawalMethod: req.WithdrawalMethod,
-			AccountInfo:      accountInfoJSON,
-			Status:           constants.WithdrawalStatusPending, // 待审核
-		}
-		withdrawalRequest.Creator = currentUserID
-		withdrawalRequest.Updater = currentUserID
-
 		if err := tx.WithContext(ctx).Create(withdrawalRequest).Error; err != nil {
 			return errors.Wrap(errors.CodeInternalError, err, "创建提现申请失败")
 		}
@@ -517,9 +522,10 @@ func (s *Service) CreateWithdrawalRequest(ctx context.Context, shopID uint, req
 			return errors.Wrap(errors.CodeInternalError, err, "创建钱包流水失败")
 		}
 
-		return nil
+		return s.appendWithdrawalRequestAudit(ctx, tx, withdrawalRequest, wallet, transaction)
 	})
 	if err != nil {
+		s.recordWithdrawalRequestFailure(ctx, withdrawalRequest, wallet, err)
 		return nil, err
 	}
 
@@ -625,7 +631,13 @@ func (s *Service) ResolveCommissionRecord(ctx context.Context, recordID uint, re
 	}
 
 	if record.Status != constants.CommissionStatusPendingReview {
-		return errors.New(errors.CodeInvalidParam, "该记录不是待修正状态")
+		actionCode := constants.AuditActionCommissionInvalidated
+		if req.Action == "release" {
+			actionCode = constants.AuditActionCommissionCredited
+		}
+		businessErr := errors.New(errors.CodeInvalidParam, "该记录不是待修正状态")
+		s.recordCommissionResolutionFailure(ctx, record, actionCode, "修正待审佣金失败", businessErr)
+		return businessErr
 	}
 
 	now := time.Now()
@@ -635,24 +647,37 @@ func (s *Service) ResolveCommissionRecord(ctx context.Context, recordID uint, re
 	}
 
 	if req.Action == "invalidate" {
-		return s.commissionRecordStore.UpdateByID(ctx, nil, recordID, map[string]any{
-			"status": constants.CommissionStatusInvalid,
-			"remark": resolveRemark,
+		err = s.db.Transaction(func(tx *gorm.DB) error {
+			if err := s.commissionRecordStore.UpdateByID(ctx, tx, recordID, map[string]any{
+				"status": constants.CommissionStatusInvalid,
+				"remark": resolveRemark,
+			}); err != nil {
+				return err
+			}
+			return s.appendCommissionResolutionAudit(ctx, tx, record, nil, constants.AuditActionCommissionInvalidated, "待审佣金已失效")
 		})
+		if err != nil {
+			s.recordCommissionResolutionFailure(ctx, record, constants.AuditActionCommissionInvalidated, "失效待审佣金失败", err)
+		}
+		return err
 	}
 
 	// release 入账
 	if req.Amount == nil || *req.Amount <= 0 {
-		return errors.New(errors.CodeInvalidParam, "入账操作必须指定金额")
+		businessErr := errors.New(errors.CodeInvalidParam, "入账操作必须指定金额")
+		s.recordCommissionResolutionFailure(ctx, record, constants.AuditActionCommissionCredited, "待审佣金入账失败", businessErr)
+		return businessErr
 	}
 	amount := *req.Amount
 
 	wallet, err := s.agentWalletStore.GetCommissionWallet(ctx, record.ShopID)
 	if err != nil {
-		return errors.Wrap(errors.CodeNotFound, err, "店铺佣金钱包不存在")
+		businessErr := errors.Wrap(errors.CodeNotFound, err, "店铺佣金钱包不存在")
+		s.recordCommissionResolutionFailure(ctx, record, constants.AuditActionCommissionCredited, "待审佣金入账失败", businessErr)
+		return businessErr
 	}
 
-	return s.db.Transaction(func(tx *gorm.DB) error {
+	err = s.db.Transaction(func(tx *gorm.DB) error {
 		if err := s.commissionRecordStore.UpdateByID(ctx, tx, recordID, map[string]any{
 			"status":      constants.CommissionStatusReleased,
 			"amount":      amount,
@@ -682,8 +707,12 @@ func (s *Service) ResolveCommissionRecord(ctx context.Context, recordID uint, re
 			return errors.Wrap(errors.CodeDatabaseError, err, "更新入账后余额失败")
 		}
 
-		return nil
+		return s.appendCommissionResolutionAudit(ctx, tx, record, wallet, constants.AuditActionCommissionCredited, "待审佣金已入账")
 	})
+	if err != nil {
+		s.recordCommissionResolutionFailure(ctx, record, constants.AuditActionCommissionCredited, "待审佣金入账失败", err)
+	}
+	return err
 }
 
 // generateWithdrawalNo 生成提现单号