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

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

internal/handler/app/client_wallet.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/break/junhong_cmp_fiber/internal/infrastructure/audit"
+	"github.com/break/junhong_cmp_fiber/internal/infrastructure/integrationlog"
 	"github.com/break/junhong_cmp_fiber/internal/middleware"
 	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
@@ -46,6 +48,8 @@ type ClientWalletHandler struct {
 	iotCardStore        *postgres.IotCardStore
 	deviceStore         *postgres.DeviceStore
 	paymentMethodPolicy ClientPaymentMethodPolicy
+	auditWriter         *audit.Writer
+	paymentIntegration  *integrationlog.Repository
 }
 
 // SetPaymentMethodPolicy 注入 C 端支付方式策略。
@@ -53,6 +57,12 @@ func (h *ClientWalletHandler) SetPaymentMethodPolicy(policy ClientPaymentMethodP
 	h.paymentMethodPolicy = policy
 }
 
+// SetPaymentAudit 注入充值支付审计与外部交互日志接缝。
+func (h *ClientWalletHandler) SetPaymentAudit(writer *audit.Writer, integration *integrationlog.Repository) {
+	h.auditWriter = writer
+	h.paymentIntegration = integration
+}
+
 // NewClientWalletHandler 创建 C 端钱包处理器
 func NewClientWalletHandler(
 	assetService *asset.Service,
@@ -352,6 +362,10 @@ func (h *ClientWalletHandler) createWechatRecharge(
 
 	// 先初始化生效支付通道并创建预支付订单，确认支付通道可用
 	// 避免先写入充值记录后支付初始化失败，导致产生孤儿记录
+	attempt, startedAt, err := h.startRechargePaymentAttempt(resolved.SkipPermissionCtx, config, paymentNo, rechargeNo, req.Amount)
+	if err != nil {
+		return err
+	}
 	payConfig, err := h.createClientRechargePayConfig(
 		resolved.SkipPermissionCtx,
 		config,
@@ -363,6 +377,12 @@ func (h *ClientWalletHandler) createWechatRecharge(
 		int(req.Amount),
 	)
 	if err != nil {
+		if completeErr := h.completeRechargePaymentAttempt(resolved.SkipPermissionCtx, attempt, startedAt, constants.IntegrationResultUnknown, "request_unknown", "充值支付预下单结果未知"); completeErr != nil {
+			return completeErr
+		}
+		return err
+	}
+	if err := h.completeRechargePaymentAttempt(resolved.SkipPermissionCtx, attempt, startedAt, constants.IntegrationResultSuccess, "SUCCESS", ""); err != nil {
 		return err
 	}
 
@@ -381,10 +401,6 @@ func (h *ClientWalletHandler) createWechatRecharge(
 		OperatorType:    constants.OperatorTypePersonalCustomer,
 		Generation:      resolved.Generation,
 	}
-	if err := h.rechargeOrderStore.Create(resolved.SkipPermissionCtx, rechargeOrder); err != nil {
-		return errors.Wrap(errors.CodeDatabaseError, err, "创建充值订单失败")
-	}
-
 	payment := &model.Payment{
 		PaymentNo:       paymentNo,
 		OrderID:         rechargeOrder.ID,
@@ -394,8 +410,17 @@ func (h *ClientWalletHandler) createWechatRecharge(
 		Status:          model.PaymentRecordStatusPending,
 		PaymentConfigID: &config.ID,
 	}
-	if err := h.paymentStore.Create(resolved.SkipPermissionCtx, payment); err != nil {
-		return errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
+	if err := h.db.WithContext(resolved.SkipPermissionCtx).Transaction(func(tx *gorm.DB) error {
+		if err := h.rechargeOrderStore.CreateWithTx(resolved.SkipPermissionCtx, tx, rechargeOrder); err != nil {
+			return errors.Wrap(errors.CodeDatabaseError, err, "创建充值订单失败")
+		}
+		payment.OrderID = rechargeOrder.ID
+		if err := h.paymentStore.CreateWithTx(resolved.SkipPermissionCtx, tx, payment); err != nil {
+			return errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
+		}
+		return h.appendRechargePaymentCreatedAudit(resolved.SkipPermissionCtx, tx, payment, rechargeOrder)
+	}); err != nil {
+		return err
 	}
 
 	return response.Success(c, &dto.ClientRechargeResponse{
@@ -456,14 +481,17 @@ func (h *ClientWalletHandler) createAlipayRecharge(
 			return errors.Wrap(errors.CodeDatabaseError, err, "创建充值订单失败")
 		}
 		payment.OrderID = rechargeOrder.ID
-		return h.paymentStore.CreateWithTx(resolved.SkipPermissionCtx, tx, payment)
+		if err := h.paymentStore.CreateWithTx(resolved.SkipPermissionCtx, tx, payment); err != nil {
+			return err
+		}
+		return h.appendRechargePaymentCreatedAudit(resolved.SkipPermissionCtx, tx, payment, rechargeOrder)
 	}); err != nil {
 		return err
 	}
 
 	wapURL, err := alipay.BuildWapPayURL(resolved.SkipPermissionCtx, config, payment, "资产钱包充值")
 	if err != nil {
-		if updateErr := h.paymentStore.UpdateStatus(resolved.SkipPermissionCtx, payment.ID, model.PaymentRecordStatusFailed); updateErr != nil {
+		if updateErr := h.markRechargePaymentFailed(resolved.SkipPermissionCtx, payment); updateErr != nil {
 			h.logger.Warn("标记支付宝支付单 failed 失败",
 				zap.String("payment_no", paymentNo),
 				zap.Error(updateErr),