feat(收口): 补齐 8 月迭代缺口并同步 Spec 与证据链
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
- 新增六对成对迁移 000232–000237:H5 弹窗类型、退款结算标识与申请人备注、优先轮询事实字段与两个新终态、通道阈值命中留痕、手机号最近解绑人、提现资格校验留痕 - 退款:原因必填与申请人备注、来源支付与渠道流水冻结、线下处理流水号补录审计、按订单查询可选退款方式、企微审批材料补齐且新增字段缺失映射即明确失败 - 优先轮询:人工关闭、有效期到期独立周期任务、失败与过期人工重触发、事实字段与异常重试查询、资产解析端点只读投影 - 通道阈值:命中事实同事务留痕与命中记录查询;员工账单:列表筛选与详情投影;商户池:列表投影与统计周期语义;H5:弹窗类型与类别排序 - 手机号:有效关联数量与最近解绑人、短信验证码失败次数限制;导出:佣金明细十五列与报表序号列 - 时间筛选:三处新增筛选纳入统一严格解析契约,员工账单产生时间参数改名 - 同步 12 份主 Spec 需求、两端点与异步任务证据链,门禁 context-health 与 OpenSpec 校验通过
This commit is contained in:
@@ -64,6 +64,7 @@ func (s *Service) loadAttemptResponses(ctx context.Context, refunds []*model.Ref
|
||||
RefundAmount: attempt.RefundAmount,
|
||||
FrozenActualReceivedAmount: attempt.FrozenActualReceivedAmount,
|
||||
RefundReason: attempt.RefundReason,
|
||||
Remark: attempt.Remark,
|
||||
CustomerAccountInfo: attempt.CustomerAccountInfo,
|
||||
CustomerVoucherKey: []string(attempt.CustomerVoucherKeys),
|
||||
ChannelRefundRequestNo: attempt.ChannelRefundRequestNo,
|
||||
|
||||
71
internal/service/refund/material.go
Normal file
71
internal/service/refund/material.go
Normal file
@@ -0,0 +1,71 @@
|
||||
package refund
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"go.uber.org/zap"
|
||||
|
||||
refundapprovalapp "github.com/break/junhong_cmp_fiber/internal/application/refundapproval"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
)
|
||||
|
||||
// refundAssetType 把订单类型映射为退款资产类型:card 单卡、device 设备。
|
||||
// 与退款列表、详情响应的资产类型口径一致;空值或未知订单类型返回空串。
|
||||
func refundAssetType(orderType string) string {
|
||||
switch orderType {
|
||||
case model.OrderTypeSingleCard:
|
||||
return "card"
|
||||
case model.OrderTypeDevice:
|
||||
return "device"
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
// loadRefundMaterial 按既有展示口径解析本次提交的企业微信审批材料事实。
|
||||
//
|
||||
// 三个维度各自独立解析且全部尽力而为:
|
||||
// 1. 资产类型沿用退款申请的下单快照推导(refundAssetType,与详情响应同一规则);
|
||||
// 2. 设备类型与型号取退款请求关联设备,无关联设备或设备不可读时留空;
|
||||
// 3. 套餐已用量与总量复用退款展示解析规则(loadRefundPackageUsages,冻结套餐记录 → 订单主套餐 →
|
||||
// 订单任一套餐)与真流量口径,解析不到时为 0;
|
||||
// 4. 原支付渠道交易流水号取创建申请时冻结的原成功支付事实,线下订单为空。
|
||||
//
|
||||
// 审批材料是审批判断依据而非金额与状态判定输入,因此解析失败 MUST NOT 阻断审批提交:
|
||||
// 任一项不可解析时以空值或零值提交,并记录日志供排查。
|
||||
func (s *Service) loadRefundMaterial(ctx context.Context, refund *model.RefundRequest, payment *model.Payment) refundapprovalapp.RefundMaterial {
|
||||
material := refundapprovalapp.RefundMaterial{
|
||||
AssetType: refundAssetType(refund.OrderType),
|
||||
OriginalChannelTradeNo: strings.TrimSpace(refund.OriginalChannelTradeNo),
|
||||
}
|
||||
if payment != nil && strings.TrimSpace(payment.ThirdPartyTradeNo) != "" {
|
||||
material.OriginalChannelTradeNo = strings.TrimSpace(payment.ThirdPartyTradeNo)
|
||||
}
|
||||
if refund.DeviceID != nil && *refund.DeviceID > 0 {
|
||||
var device model.Device
|
||||
if err := s.db.WithContext(ctx).Select("id", "device_type", "device_model").First(&device, *refund.DeviceID).Error; err != nil {
|
||||
s.logMaterialFailure(ctx, refund.ID, "device", err)
|
||||
} else {
|
||||
material.DeviceType = strings.TrimSpace(device.DeviceType)
|
||||
material.DeviceModel = strings.TrimSpace(device.DeviceModel)
|
||||
}
|
||||
}
|
||||
usages, err := s.loadRefundPackageUsages(ctx, []*model.RefundRequest{refund})
|
||||
if err != nil {
|
||||
s.logMaterialFailure(ctx, refund.ID, "package_usage", err)
|
||||
} else if usage, exists := usages[refund.ID]; exists {
|
||||
material.PackageUsedMB = usage.UsedMB
|
||||
material.PackageTotalMB = usage.TotalMB
|
||||
}
|
||||
return material
|
||||
}
|
||||
|
||||
// logMaterialFailure 记录审批材料解析失败:材料按空值或零值降级提交,因此只记录不返回错误。
|
||||
func (s *Service) logMaterialFailure(ctx context.Context, refundID uint, dimension string, err error) {
|
||||
if s.logger == nil {
|
||||
return
|
||||
}
|
||||
s.logger.Warn("退款审批材料解析失败,按空值提交",
|
||||
zap.Uint("refund_id", refundID), zap.String("dimension", dimension), zap.Error(err))
|
||||
}
|
||||
@@ -263,3 +263,29 @@ func buildChannelRefundRequestNo(method string, config *model.WechatConfig) stri
|
||||
}
|
||||
return requestChannelRefundNo(config, time.Now())
|
||||
}
|
||||
|
||||
// frozenSourcePaymentNo 取原成功支付记录的支付单号作为冻结的来源支付单号。
|
||||
// 线下订单没有线上支付记录(payment 为 nil),返回空串以空值保存,不阻断申请创建。
|
||||
func frozenSourcePaymentNo(payment *model.Payment) string {
|
||||
if payment == nil {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(payment.PaymentNo)
|
||||
}
|
||||
|
||||
// frozenOriginalChannelTradeNo 取原成功支付记录的渠道交易流水号作为冻结的原支付渠道交易流水号。
|
||||
// 线下订单没有线上支付记录(payment 为 nil 或流水号缺失),返回空串以空值保存。
|
||||
func frozenOriginalChannelTradeNo(payment *model.Payment) string {
|
||||
if payment == nil {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(payment.ThirdPartyTradeNo)
|
||||
}
|
||||
|
||||
// applicantRemark 归一化请求中的申请人备注:缺省与纯空白一律视为未填写。
|
||||
func applicantRemark(value *string) string {
|
||||
if value == nil {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(*value)
|
||||
}
|
||||
|
||||
@@ -152,6 +152,11 @@ func (s *Service) Create(ctx context.Context, req *dto.CreateRefundRequest) (*dt
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// 退款原因必填只在创建与重提用例校验:历史申请与补发历史审批路径不受约束、不追溯。
|
||||
refundReason := strings.TrimSpace(req.RefundReason)
|
||||
if refundReason == "" {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "退款原因不能为空")
|
||||
}
|
||||
if err := validateRefundMethod(decision, req.Method); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -191,8 +196,11 @@ func (s *Service) Create(ctx context.Context, req *dto.CreateRefundRequest) (*dt
|
||||
Method: req.Method,
|
||||
CustomerAccountInfo: req.CustomerAccountInfo,
|
||||
RefundVoucherKey: refundVoucherKey,
|
||||
RefundReason: req.RefundReason,
|
||||
Status: model.RefundStatusPending,
|
||||
RefundReason: refundReason,
|
||||
// 来源支付事实在创建时冻结:线下订单没有线上支付记录,两个字段以空值保存且不阻断申请创建。
|
||||
SourcePaymentNo: frozenSourcePaymentNo(decision.Payment),
|
||||
OriginalChannelTradeNo: frozenOriginalChannelTradeNo(decision.Payment),
|
||||
Status: model.RefundStatusPending,
|
||||
}
|
||||
refund.Creator = userID
|
||||
refund.Updater = userID
|
||||
@@ -203,6 +211,8 @@ func (s *Service) Create(ctx context.Context, req *dto.CreateRefundRequest) (*dt
|
||||
result, err := s.refundApprovalCreation.Execute(ctx, refundapprovalapp.CreateCommand{
|
||||
Refund: refund, Order: order, SubmitterAccountID: userID,
|
||||
ChannelRefundRequestNo: buildChannelRefundRequestNo(refund.Method, decision.ChannelConfig),
|
||||
ApplicantRemark: applicantRemark(req.Remark),
|
||||
Material: s.loadRefundMaterial(ctx, refund, decision.Payment),
|
||||
})
|
||||
if err != nil {
|
||||
failedRefund := *refund
|
||||
@@ -290,7 +300,9 @@ func (s *Service) TriggerApproval(ctx context.Context, id uint) (*dto.RefundResp
|
||||
if err != nil {
|
||||
return nil, errors.New(errors.CodeNotFound, "退款申请不存在")
|
||||
}
|
||||
result, err := s.refundApprovalCreation.TriggerHistorical(ctx, refund.ID)
|
||||
// 补发不追溯退款原因必填,但仍按既有展示口径解析审批材料,使新增控件的材料在补发路径同样完整。
|
||||
payment, _ := s.loadPaidPackagePayment(ctx, refund.OrderID)
|
||||
result, err := s.refundApprovalCreation.TriggerHistorical(ctx, refund.ID, s.loadRefundMaterial(ctx, refund, payment))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -832,6 +844,13 @@ func (s *Service) Resubmit(ctx context.Context, id uint, req *dto.ResubmitRefund
|
||||
if req.RefundReason != nil {
|
||||
refundReason = *req.RefundReason
|
||||
}
|
||||
// 重提同样强制退款原因必填(去空白后非空);不填时沿用原有原因,原有原因为空的存量单不允许重提。
|
||||
refundReason = strings.TrimSpace(refundReason)
|
||||
if refundReason == "" {
|
||||
s.recordRefundFailure(ctx, constants.AuditActionRefundResubmitted, "重新提交退款申请失败", refund, order,
|
||||
errors.New(errors.CodeInvalidParam, "退款原因不能为空"))
|
||||
return errors.New(errors.CodeInvalidParam, "退款原因不能为空")
|
||||
}
|
||||
customerAccountInfo := refund.CustomerAccountInfo
|
||||
if req.CustomerAccountInfo != nil {
|
||||
customerAccountInfo = *req.CustomerAccountInfo
|
||||
@@ -840,8 +859,14 @@ func (s *Service) Resubmit(ctx context.Context, id uint, req *dto.ResubmitRefund
|
||||
s.recordRefundFailure(ctx, constants.AuditActionRefundResubmitted, "重新提交退款申请失败", refund, nil, err)
|
||||
return err
|
||||
}
|
||||
// 申请人备注缺省沿用该退款单最近一次尝试冻结的备注,填写时替换;两者都只影响本次新增的尝试快照。
|
||||
remark := s.latestAttemptRemark(ctx, refund)
|
||||
if req.Remark != nil {
|
||||
remark = applicantRemark(req.Remark)
|
||||
}
|
||||
|
||||
// 重提的实收金额重新派生并冻结;提交人传入的实收金额一律忽略。
|
||||
// 来源支付事实随本次重提一并重新冻结,与重新派生的冻结实收金额保持同一事实来源。
|
||||
updated := *refund
|
||||
updated.Method = method
|
||||
updated.RequestedRefundAmount = requestedRefundAmount
|
||||
@@ -850,6 +875,8 @@ func (s *Service) Resubmit(ctx context.Context, id uint, req *dto.ResubmitRefund
|
||||
updated.RefundVoucherKey = refundVoucherKey
|
||||
updated.RefundReason = refundReason
|
||||
updated.CustomerAccountInfo = customerAccountInfo
|
||||
updated.SourcePaymentNo = frozenSourcePaymentNo(decision.Payment)
|
||||
updated.OriginalChannelTradeNo = frozenOriginalChannelTradeNo(decision.Payment)
|
||||
updated.Creator = userID
|
||||
|
||||
attemptChannelRefundRequestNo := buildChannelRefundRequestNo(method, decision.ChannelConfig)
|
||||
@@ -858,6 +885,8 @@ func (s *Service) Resubmit(ctx context.Context, id uint, req *dto.ResubmitRefund
|
||||
}
|
||||
if _, err := s.refundApprovalCreation.Resubmit(ctx, id, refundapprovalapp.ResubmitCommand{
|
||||
Refund: &updated, ChannelRefundRequestNo: attemptChannelRefundRequestNo,
|
||||
ApplicantRemark: remark,
|
||||
Material: s.loadRefundMaterial(ctx, &updated, decision.Payment),
|
||||
}); err != nil {
|
||||
s.recordRefundFailure(ctx, constants.AuditActionRefundResubmitted, "重新提交退款申请失败", refund, order, err)
|
||||
return err
|
||||
@@ -1268,20 +1297,13 @@ func normalizeRefundVoucherKey(keys []string) (model.StringJSONBArray, error) {
|
||||
|
||||
// buildRefundResponse 将退款 Model 转换为 DTO 响应
|
||||
func buildRefundResponse(r *model.RefundRequest) *dto.RefundResponse {
|
||||
assetType := ""
|
||||
if r.OrderType == model.OrderTypeSingleCard {
|
||||
assetType = "card"
|
||||
} else if r.OrderType == model.OrderTypeDevice {
|
||||
assetType = "device"
|
||||
}
|
||||
|
||||
resp := &dto.RefundResponse{
|
||||
ID: r.ID,
|
||||
RefundNo: r.RefundNo,
|
||||
OrderID: r.OrderID,
|
||||
OrderNo: r.OrderNo,
|
||||
AssetIdentifier: r.AssetIdentifier,
|
||||
AssetType: assetType,
|
||||
AssetType: refundAssetType(r.OrderType),
|
||||
IotCardID: r.IotCardID,
|
||||
DeviceID: r.DeviceID,
|
||||
PackageUsageID: r.PackageUsageID,
|
||||
@@ -1303,6 +1325,10 @@ func buildRefundResponse(r *model.RefundRequest) *dto.RefundResponse {
|
||||
ChannelRefundNo: r.ChannelRefundNo,
|
||||
ChannelRefundRequestNo: r.ChannelRefundRequestNo,
|
||||
ChannelRefundAmount: r.ChannelRefundAmount,
|
||||
SourcePaymentNo: r.SourcePaymentNo,
|
||||
OriginalChannelTradeNo: r.OriginalChannelTradeNo,
|
||||
OfflineSettlementNo: r.OfflineSettlementNo,
|
||||
OfflineSettledBy: r.OfflineSettledBy,
|
||||
FailureReason: r.FailureReason,
|
||||
FailureReasonName: constants.RefundFailureReasonName(r.FailureReason),
|
||||
FailureMessage: r.FailureMessage,
|
||||
@@ -1330,6 +1356,9 @@ func buildRefundResponse(r *model.RefundRequest) *dto.RefundResponse {
|
||||
if r.ChannelRefundedAt != nil {
|
||||
resp.ChannelRefundedAt = r.ChannelRefundedAt.Format("2006-01-02 15:04:05")
|
||||
}
|
||||
if r.OfflineSettledAt != nil {
|
||||
resp.OfflineSettledAt = r.OfflineSettledAt.Format("2006-01-02 15:04:05")
|
||||
}
|
||||
|
||||
return resp
|
||||
}
|
||||
|
||||
203
internal/service/refund/settlement.go
Normal file
203
internal/service/refund/settlement.go
Normal file
@@ -0,0 +1,203 @@
|
||||
package refund
|
||||
|
||||
import (
|
||||
"context"
|
||||
stderrors "errors"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
|
||||
"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/pkg/auditcontext"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/middleware"
|
||||
)
|
||||
|
||||
// latestAttemptRemark 读取该退款单最近一次审批尝试冻结的申请人备注。
|
||||
// 重提时未填写备注则沿用该值,使申请人不必重复填写;读取失败按未填写处理(备注不参与金额与状态判定)。
|
||||
func (s *Service) latestAttemptRemark(ctx context.Context, refund *model.RefundRequest) string {
|
||||
if refund == nil || refund.ID == 0 {
|
||||
return ""
|
||||
}
|
||||
var attempt model.RefundRequestAttempt
|
||||
err := s.db.WithContext(ctx).
|
||||
Select("id", "remark").
|
||||
Where("refund_id = ?", refund.ID).
|
||||
Order("attempt_no DESC, id DESC").
|
||||
First(&attempt).Error
|
||||
if err != nil {
|
||||
if err != gorm.ErrRecordNotFound {
|
||||
s.logMaterialFailure(ctx, refund.ID, "applicant_remark", err)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(attempt.Remark)
|
||||
}
|
||||
|
||||
// OrderOptions 按来源订单查询可选退款方式。
|
||||
//
|
||||
// 判定复用创建与重提使用的方式判定实现(decideRefundMethods),其中原路可退的凭证判定
|
||||
// 复用执行前预检所用的同一凭证判定来源(refundchannel.RefundCredentialIssue),
|
||||
// MUST NOT 引入第二套判定或独立开关。审批提交只消费已冻结材料,本查询不产生任何副作用。
|
||||
//
|
||||
// 判定所需事实缺失(无原成功支付记录、金额非正、支付方式不支持退款)时返回不可用原因而非报错;
|
||||
// 数据库或能力未配置等基础设施故障仍按错误返回。查询受订单数据范围约束,越权与订单不存在不可区分。
|
||||
func (s *Service) OrderOptions(ctx context.Context, req *dto.RefundOrderOptionsRequest) (*dto.RefundOrderOptionsResponse, error) {
|
||||
if req == nil || req.OrderID == 0 {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "订单ID不能为空")
|
||||
}
|
||||
order, err := s.orderStore.GetByID(ctx, req.OrderID)
|
||||
if err != nil {
|
||||
// 数据范围外的订单与不存在的订单返回同一结果,避免形成可枚举差异。
|
||||
return nil, errors.New(errors.CodeNotFound, "订单不存在")
|
||||
}
|
||||
|
||||
response := &dto.RefundOrderOptionsResponse{
|
||||
OrderID: order.ID,
|
||||
OrderNo: order.OrderNo,
|
||||
OrderPaymentType: order.PaymentMethod,
|
||||
Methods: []dto.RefundMethodOptionResponse{},
|
||||
RefundCapability: dto.RefundCapabilityResponse{},
|
||||
}
|
||||
decision, err := s.decideRefundMethods(ctx, order)
|
||||
if err != nil {
|
||||
var appErr *errors.AppError
|
||||
if stderrors.As(err, &appErr) && appErr.Code == errors.CodeInvalidParam {
|
||||
// 判定事实缺失:以不可用原因返回,不让只读查询报错。
|
||||
response.UnavailableReason = appErr.Message
|
||||
response.RefundCapability = dto.RefundCapabilityResponse{Available: false, Unavailable: appErr.Message}
|
||||
return response, nil
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
response.Methods = make([]dto.RefundMethodOptionResponse, 0, len(decision.Options))
|
||||
for _, option := range decision.Options {
|
||||
response.Methods = append(response.Methods, dto.RefundMethodOptionResponse{
|
||||
Method: option.Method, MethodName: option.Name,
|
||||
Available: option.Available, Unavailable: option.Reason,
|
||||
})
|
||||
}
|
||||
response.RefundCapability = refundCapabilityProjection(decision.Options)
|
||||
if decision.Payment != nil {
|
||||
response.OriginalChannelTradeNo = strings.TrimSpace(decision.Payment.ThirdPartyTradeNo)
|
||||
response.MerchantID = decision.Payment.MerchantID
|
||||
response.MerchantName = strings.TrimSpace(decision.Payment.MerchantNameSnapshot)
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// refundCapabilityProjection 从方式判定结果投影原路退款能力校验结果。
|
||||
// 订单不含原路方式时能力不可用,原因取该订单方式矩阵的说明,避免展示与方式集合不一致的结论。
|
||||
func refundCapabilityProjection(options []refundMethodOption) dto.RefundCapabilityResponse {
|
||||
for _, option := range options {
|
||||
if option.Method != constants.RefundMethodOriginalRoute {
|
||||
continue
|
||||
}
|
||||
return dto.RefundCapabilityResponse{Available: option.Available, Unavailable: option.Reason}
|
||||
}
|
||||
return dto.RefundCapabilityResponse{Available: false, Unavailable: "该订单的退款方式矩阵不包含原路退款"}
|
||||
}
|
||||
|
||||
// RegisterOfflineSettlement 登记或更正线下退款处理流水号。
|
||||
//
|
||||
// 仅客户收款信息退款(线下到账方式)允许登记;重复调用即更正,历史值由审计留存。
|
||||
// 登记在同一事务内写审计(操作者、时间、前后值),且 MUST NOT 改变退款状态、实收金额、
|
||||
// 套餐失效与佣金回溯规则(ENG-TX-001:事实与要求成功必达的审计同事务)。
|
||||
func (s *Service) RegisterOfflineSettlement(ctx context.Context, id uint, req *dto.OfflineSettlementRequest) (*dto.RefundResponse, error) {
|
||||
userID := middleware.GetUserIDFromContext(ctx)
|
||||
if userID == 0 {
|
||||
return nil, errors.New(errors.CodeUnauthorized, "未授权访问")
|
||||
}
|
||||
if id == 0 || req == nil {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "退款申请ID不能为空")
|
||||
}
|
||||
if s.auditWriter == nil {
|
||||
return nil, errors.New(errors.CodeServiceUnavailable, "退款统一审计接缝未配置")
|
||||
}
|
||||
settlementNo := strings.TrimSpace(req.OfflineSettlementNo)
|
||||
if settlementNo == "" {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "线下退款处理流水号不能为空")
|
||||
}
|
||||
if len(settlementNo) > 128 {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "线下退款处理流水号长度不能超过 128")
|
||||
}
|
||||
refund, err := s.refundStore.GetByIDForOperation(ctx, id)
|
||||
if err != nil {
|
||||
// 数据范围外的退款申请与不存在返回同一结果。
|
||||
return nil, errors.New(errors.CodeNotFound, "退款申请不存在")
|
||||
}
|
||||
if refund.Method != constants.RefundMethodCustomerAccount {
|
||||
return nil, errors.New(errors.CodeInvalidStatus, "仅客户收款信息退款方式可登记线下退款处理流水号")
|
||||
}
|
||||
ctx = auditcontext.With(ctx, auditcontext.Context{CorrelationID: refund.RefundNo})
|
||||
settledAt := time.Now().UTC()
|
||||
err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var current model.RefundRequest
|
||||
if err := tx.WithContext(ctx).Clauses(clause.Locking{Strength: "UPDATE"}).First(¤t, id).Error; err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
return errors.New(errors.CodeNotFound, "退款申请不存在")
|
||||
}
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "锁定退款申请失败")
|
||||
}
|
||||
if current.Method != constants.RefundMethodCustomerAccount {
|
||||
return errors.New(errors.CodeInvalidStatus, "仅客户收款信息退款方式可登记线下退款处理流水号")
|
||||
}
|
||||
beforeState := refundSettlementState(¤t)
|
||||
result := tx.WithContext(ctx).Model(&model.RefundRequest{}).
|
||||
Where("id = ?", id).
|
||||
Updates(map[string]any{
|
||||
"offline_settlement_no": settlementNo,
|
||||
"offline_settled_at": settledAt,
|
||||
"offline_settled_by": userID,
|
||||
"updater": userID,
|
||||
"updated_at": settledAt,
|
||||
})
|
||||
if result.Error != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, result.Error, "登记线下退款处理流水号失败")
|
||||
}
|
||||
if result.RowsAffected != 1 {
|
||||
return errors.New(errors.CodeConflict, "退款申请状态已变化")
|
||||
}
|
||||
if err := tx.WithContext(ctx).First(¤t, id).Error; err != nil {
|
||||
return errors.Wrap(errors.CodeDatabaseError, err, "查询退款申请登记后快照失败")
|
||||
}
|
||||
primary := audit.RefundResource(¤t, constants.AuditResourceRelationPrimary, constants.AuditResourceRoleRefundTarget)
|
||||
primary.BeforeData = beforeState
|
||||
primary.AfterData = refundSettlementState(¤t)
|
||||
primary.SubjectVisibility = constants.AuditSubjectResult
|
||||
primary.SubjectSummary = "登记线下退款处理流水号"
|
||||
if err := s.auditWriter.Append(ctx, tx, audit.AppendInput{
|
||||
ActionCode: constants.AuditActionRefundOfflineSettled, Summary: "登记线下退款处理流水号",
|
||||
ScopeType: constants.AuditScopePlatform, Result: constants.AuditResultSuccess,
|
||||
CorrelationID: current.RefundNo,
|
||||
Metadata: map[string]any{"operator_id": userID, "settled_at": settledAt},
|
||||
Resources: []audit.ResourceInput{primary},
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
refund = ¤t
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return buildRefundResponse(refund), nil
|
||||
}
|
||||
|
||||
// refundSettlementState 投影线下退款处理流水号的审计前后值。
|
||||
// 只包含本用例改动的字段,MUST NOT 夹带状态、实收金额等未改动事实,使审计前后值即登记差异。
|
||||
func refundSettlementState(refund *model.RefundRequest) map[string]any {
|
||||
state := map[string]any{
|
||||
"offline_settlement_no": refund.OfflineSettlementNo,
|
||||
"offline_settled_by": refund.OfflineSettledBy,
|
||||
}
|
||||
if refund.OfflineSettledAt != nil {
|
||||
state["offline_settled_at"] = refund.OfflineSettledAt
|
||||
}
|
||||
return state
|
||||
}
|
||||
Reference in New Issue
Block a user