feat(finance): 增加线下结算实际操作人

This commit is contained in:
yml
2026-11-15 17:14:23 +08:00
parent 79b8bc3ac1
commit b1a898ad92
35 changed files with 543 additions and 129 deletions
+10 -6
View File
@@ -405,6 +405,7 @@ func (r *Repository) MarkOfflineSettlement(ctx context.Context, pickupID uint64,
now := time.Now()
pickup.OfflineSettlementStatus = OfflineSettlementStatusSettled
pickup.OfflineSettlementRemark = strings.TrimSpace(req.Remark)
pickup.ActualPayoutOperator = strings.TrimSpace(req.ActualOperator)
pickup.OfflineSettledBy = &adminID
pickup.OfflineSettledAt = &now
if err := tx.Save(&pickup).Error; err != nil {
@@ -424,6 +425,7 @@ func (r *Repository) MarkOfflineSettlement(ctx context.Context, pickupID uint64,
}
if err := appendPickupEvent(tx, pickup, "pickup_offline_settlement_confirmed", adminID, "确认已完成提号线下结算。", pickup.OfflineSettlementRemark, map[string]any{
"settle_amount_cent": effectiveSettleAmountCent, "settled_adjustment_count": pendingTotals.Count,
"offline_settlement_actual_operator": pickup.ActualPayoutOperator,
}, before); err != nil {
return err
}
@@ -437,12 +439,13 @@ func (r *Repository) MarkOfflineSettlement(ctx context.Context, pickupID uint64,
BizID: &bid,
Meta: meta,
Detail: map[string]any{
"pickup_no": pickup.PickupNo,
"settle_amount_cent": effectiveSettleAmountCent,
"settled_adjustment_count": pendingTotals.Count,
"before_offline_settlement_status": OfflineSettlementStatusPending,
"after_offline_settlement_status": pickup.OfflineSettlementStatus,
"remark": pickup.OfflineSettlementRemark,
"pickup_no": pickup.PickupNo,
"settle_amount_cent": effectiveSettleAmountCent,
"settled_adjustment_count": pendingTotals.Count,
"before_offline_settlement_status": OfflineSettlementStatusPending,
"after_offline_settlement_status": pickup.OfflineSettlementStatus,
"offline_settlement_actual_operator": pickup.ActualPayoutOperator,
"remark": pickup.OfflineSettlementRemark,
},
})
})
@@ -1619,6 +1622,7 @@ func (row pickupRow) toDTO() PickupDTO {
Status: row.Status,
OfflineSettlementStatus: row.OfflineSettlementStatus,
OfflineSettlementRemark: row.OfflineSettlementRemark,
ActualPayoutOperator: row.ActualPayoutOperator,
OfflineSettledBy: row.OfflineSettledBy,
OfflineSettledAt: row.OfflineSettledAt,
Remark: row.Remark,