diff --git a/backend/internal/model/cs_manual_entry.go b/backend/internal/model/cs_manual_entry.go index d2aed685..19ce13d9 100644 --- a/backend/internal/model/cs_manual_entry.go +++ b/backend/internal/model/cs_manual_entry.go @@ -31,12 +31,12 @@ func (CSManualEntry) TableName() string { return "cs_manual_entries" } -// CSManualEntryOption 客服手动录单的可选项配置(平台 / 操作人)。 +// CSManualEntryOption 客服手动录单的可选项配置(平台 / 录单操作人 / 出款实际操作人)。 // 仅作为录单表单的下拉数据源,记录里保存的是名称快照。 // 操作人选项可通过 group_tag 标记所属组别(收号/出号),录单时用于自动带出组别。 type CSManualEntryOption struct { ID uint64 `gorm:"primaryKey" json:"id"` - Type string `gorm:"size:16;not null;uniqueIndex:uk_cs_manual_entry_options_type_name,priority:1" json:"type"` + Type string `gorm:"size:32;not null;uniqueIndex:uk_cs_manual_entry_options_type_name,priority:1" json:"type"` Name string `gorm:"size:64;not null;uniqueIndex:uk_cs_manual_entry_options_type_name,priority:2" json:"name"` GroupTag string `gorm:"size:16;not null;default:''" json:"group_tag"` SortOrder int `gorm:"not null;default:0" json:"sort_order"` diff --git a/backend/internal/model/order.go b/backend/internal/model/order.go index ab3f7d3b..70c009d2 100644 --- a/backend/internal/model/order.go +++ b/backend/internal/model/order.go @@ -72,6 +72,7 @@ type RentalOrder struct { OfflineSettlementStatus string `gorm:"size:16;not null;default:'none';index" json:"offline_settlement_status"` OfflineSettlementAmountCent int64 `gorm:"not null;default:0" json:"offline_settlement_amount_cent"` OfflineSettlementRemark string `gorm:"size:255;not null;default:''" json:"offline_settlement_remark"` + ActualPayoutOperator string `gorm:"column:offline_settlement_actual_operator;size:64;not null;default:'';index" json:"offline_settlement_actual_operator"` OfflineSettledBy *uint64 `json:"offline_settled_by"` OfflineSettledAt *time.Time `json:"offline_settled_at"` RefundStatus string `gorm:"size:32;not null;default:'none';index" json:"refund_status"` diff --git a/backend/internal/model/pickup.go b/backend/internal/model/pickup.go index 21a15419..4de1b9fb 100644 --- a/backend/internal/model/pickup.go +++ b/backend/internal/model/pickup.go @@ -37,6 +37,7 @@ type AdminPickup struct { Status string `gorm:"size:20;not null;default:'picking_up';index" json:"status"` OfflineSettlementStatus string `gorm:"size:16;not null;default:'none';index" json:"offline_settlement_status"` OfflineSettlementRemark string `gorm:"size:255;not null;default:''" json:"offline_settlement_remark"` + ActualPayoutOperator string `gorm:"column:offline_settlement_actual_operator;size:64;not null;default:'';index" json:"offline_settlement_actual_operator"` OfflineSettledBy *uint64 `json:"offline_settled_by,omitempty"` OfflineSettledAt *time.Time `json:"offline_settled_at,omitempty"` Remark string `gorm:"size:255;not null;default:''" json:"remark"` diff --git a/backend/internal/modules/adminfinance/disbursement_list.go b/backend/internal/modules/adminfinance/disbursement_list.go index 2567a20e..914ba6a8 100644 --- a/backend/internal/modules/adminfinance/disbursement_list.go +++ b/backend/internal/modules/adminfinance/disbursement_list.go @@ -78,6 +78,7 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context, phoneKeyword ro.offline_settled_at AS paid_at, ro.offline_settled_by AS operator_id, COALESCE(NULLIF(operator.nickname, ''), operator.username, '') AS operator_name, + ro.offline_settlement_actual_operator AS actual_operator_name, ro.offline_settlement_remark AS remark, '' AS category, '' AS custom_category_name, @@ -119,6 +120,7 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context, phoneKeyword ap.offline_settled_at AS paid_at, ap.offline_settled_by AS operator_id, COALESCE(NULLIF(operator.nickname, ''), operator.username, '') AS operator_name, + ap.offline_settlement_actual_operator AS actual_operator_name, ap.offline_settlement_remark AS remark, '' AS category, '' AS custom_category_name, @@ -157,6 +159,7 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context, phoneKeyword fa.settled_at AS paid_at, fa.settled_by AS operator_id, COALESCE(NULLIF(operator.nickname, ''), operator.username, '') AS operator_name, + ap.offline_settlement_actual_operator AS actual_operator_name, fa.reason AS remark, '' AS category, '' AS custom_category_name, @@ -201,6 +204,7 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context, phoneKeyword wr.paid_at, COALESCE(wr.paid_by, wr.reviewed_by) AS operator_id, COALESCE(NULLIF(operator.nickname, ''), operator.username, '') AS operator_name, + '' AS actual_operator_name, CASE WHEN wr.payment_remark <> '' THEN wr.payment_remark ELSE wr.review_remark END AS remark, '' AS category, '' AS custom_category_name, @@ -242,6 +246,7 @@ func (r *Repository) disbursementListBaseQuery(ctx context.Context, phoneKeyword md.paid_at, md.created_by AS operator_id, COALESCE(NULLIF(creator.nickname, ''), creator.username, '') AS operator_name, + '' AS actual_operator_name, md.remark, md.category, md.custom_category_name, @@ -289,6 +294,9 @@ func (r *Repository) applyDisbursementFilters(db *gorm.DB, query DisbursementQue if query.OperatorID > 0 { db = db.Where("d.operator_id = ?", query.OperatorID) } + if query.ActualOperator != "" { + db = db.Where("d.actual_operator_name LIKE ?", "%"+query.ActualOperator+"%") + } if !query.StartDate.IsZero() && !query.EndDate.IsZero() { if query.DateType == "paid" { db = db.Where("d.paid_at >= ? AND d.paid_at <= ?", query.StartDate, query.EndDate) @@ -335,6 +343,7 @@ type disbursementItemRow struct { PaidAt *time.Time OperatorID *uint64 OperatorName string + ActualOperatorName string Remark string Category string CustomCategoryName string @@ -380,6 +389,7 @@ func (r disbursementItemRow) toDTO() DisbursementItemDTO { PaidAt: r.PaidAt, OperatorID: r.OperatorID, OperatorName: r.OperatorName, + ActualOperatorName: r.ActualOperatorName, Remark: r.Remark, Category: r.Category, CustomCategoryName: r.CustomCategoryName, diff --git a/backend/internal/modules/adminfinance/disbursement_list_test.go b/backend/internal/modules/adminfinance/disbursement_list_test.go index fed27a62..1b6045d1 100644 --- a/backend/internal/modules/adminfinance/disbursement_list_test.go +++ b/backend/internal/modules/adminfinance/disbursement_list_test.go @@ -30,18 +30,20 @@ func TestDisbursementListCombinesPlatformSettlementsAndWithdrawals(t *testing.T) } if err := db.Exec(`INSERT INTO rental_orders (id, order_no, listing_id, account_id, owner_id, renter_id, settlement_mode, offline_settlement_status, - offline_settlement_amount_cent, offline_settlement_remark, settled_at, offline_settled_at, offline_settled_by) + offline_settlement_amount_cent, offline_settlement_remark, offline_settlement_actual_operator, + settled_at, offline_settled_at, offline_settled_by) VALUES - (1, 'R202607010001', 101, 101, 1, 2, 'platform_managed', 'settled', 12000, '支付宝转账', ?, ?, 7), - (2, 'R202607010002', 102, 102, 1, 2, 'platform_managed', 'pending', 8000, '', ?, NULL, NULL)`, + (1, 'R202607010001', 101, 101, 1, 2, 'platform_managed', 'settled', 12000, '支付宝转账', '出款甲', ?, ?, 7), + (2, 'R202607010002', 102, 102, 1, 2, 'platform_managed', 'pending', 8000, '', '', ?, NULL, NULL)`, at(2), at(3), at(4)).Error; err != nil { t.Fatal(err) } if err := db.Exec(`INSERT INTO admin_pickups (id, pickup_no, listing_id, account_id, owner_id, admin_id, source_channel, settlement_mode, settle_amount_cent, - offline_settlement_status, offline_settlement_remark, offline_settled_by, offline_settled_at, completed_at, + offline_settlement_status, offline_settlement_remark, offline_settlement_actual_operator, + offline_settled_by, offline_settled_at, completed_at, created_at, account_snapshot) - VALUES (30, 'P202607010001', 101, 101, 1, 7, '线下录入', 'platform_managed', 4000, 'settled', '提号结算', 7, ?, ?, ?, '{}')`, + VALUES (30, 'P202607010001', 101, 101, 1, 7, '线下录入', 'platform_managed', 4000, 'settled', '提号结算', '出款乙', 7, ?, ?, ?, '{}')`, at(4), at(3), at(2)).Error; err != nil { t.Fatal(err) } @@ -125,6 +127,9 @@ func TestDisbursementListCombinesPlatformSettlementsAndWithdrawals(t *testing.T) if platformItem.PayeeName != "外部卖家" || platformItem.PayeePhone != "13800000000" || platformItem.UploaderName != "上传客服甲" { t.Fatalf("平台收款人/上传人 = %s/%s/%s", platformItem.PayeeName, platformItem.PayeePhone, platformItem.UploaderName) } + if platformItem.ActualOperatorName != "出款甲" { + t.Fatalf("平台实际操作人 = %q, want 出款甲", platformItem.ActualOperatorName) + } var pickupItem *DisbursementItemDTO for index := range result.Items { if result.Items[index].BusinessNo == "P202607010001" { @@ -135,6 +140,9 @@ func TestDisbursementListCombinesPlatformSettlementsAndWithdrawals(t *testing.T) if pickupItem == nil || pickupItem.SourceType != "pickup" || pickupItem.ActualAmountCent != 4000 { t.Fatalf("线下提号出款信息不正确: %+v", pickupItem) } + if pickupItem.ActualOperatorName != "出款乙" { + t.Fatalf("提号实际操作人 = %q, want 出款乙", pickupItem.ActualOperatorName) + } var adjustmentItem *DisbursementItemDTO for index := range result.Items { if result.Items[index].SourceType == "pickup_adjustment" { @@ -192,4 +200,22 @@ func TestDisbursementListCombinesPlatformSettlementsAndWithdrawals(t *testing.T) t.Fatalf("操作人筛选返回了其他操作人: %+v", item) } } + + actualOperatorFiltered, err := repo.Disbursements(t.Context(), DisbursementQuery{ + ActualOperator: "出款甲", + DateType: "created", + StartDate: at(1), + EndDate: time.Date(2026, 7, 10, 23, 59, 59, 0, loc), + Page: 1, + PageSize: 20, + }) + if err != nil { + t.Fatalf("按实际操作人查询出款失败: %v", err) + } + if actualOperatorFiltered.Total != 1 || len(actualOperatorFiltered.Items) != 1 { + t.Fatalf("按实际操作人查询结果 = %+v", actualOperatorFiltered.Items) + } + if actualOperatorFiltered.Items[0].BusinessNo != "R202607010001" { + t.Fatalf("实际操作人筛选命中错误记录: %+v", actualOperatorFiltered.Items[0]) + } } diff --git a/backend/internal/modules/adminfinance/dto.go b/backend/internal/modules/adminfinance/dto.go index 98bd0d7c..caa196aa 100644 --- a/backend/internal/modules/adminfinance/dto.go +++ b/backend/internal/modules/adminfinance/dto.go @@ -22,18 +22,19 @@ type DetailQuery struct { } type DisbursementQuery struct { - SourceType string - Status string - DateType string - BusinessNo string - Keyword string - Operator string - OperatorID uint64 - UserID uint64 - StartDate time.Time - EndDate time.Time - Page int - PageSize int + SourceType string + Status string + DateType string + BusinessNo string + Keyword string + Operator string + OperatorID uint64 + ActualOperator string + UserID uint64 + StartDate time.Time + EndDate time.Time + Page int + PageSize int } type OperatingExpenseQuery struct { @@ -160,6 +161,7 @@ type DisbursementItemDTO struct { PaidAt *time.Time `json:"paid_at,omitempty"` OperatorID *uint64 `json:"operator_id,omitempty"` OperatorName string `json:"operator_name"` + ActualOperatorName string `json:"actual_operator_name"` Remark string `json:"remark"` Category string `json:"category"` CustomCategoryName string `json:"custom_category_name"` diff --git a/backend/internal/modules/adminfinance/handler.go b/backend/internal/modules/adminfinance/handler.go index 4f6682fb..add46686 100644 --- a/backend/internal/modules/adminfinance/handler.go +++ b/backend/internal/modules/adminfinance/handler.go @@ -218,14 +218,15 @@ func parseDisbursementQuery(c *gin.Context) (DisbursementQuery, bool) { return DisbursementQuery{}, false } query := DisbursementQuery{ - SourceType: strings.TrimSpace(c.Query("source_type")), - Status: strings.TrimSpace(c.Query("status")), - DateType: c.DefaultQuery("date_type", "created"), - BusinessNo: strings.TrimSpace(c.Query("business_no")), - Keyword: strings.TrimSpace(c.Query("keyword")), - Operator: strings.TrimSpace(c.Query("operator")), - StartDate: start, - EndDate: end, + SourceType: strings.TrimSpace(c.Query("source_type")), + Status: strings.TrimSpace(c.Query("status")), + DateType: c.DefaultQuery("date_type", "created"), + BusinessNo: strings.TrimSpace(c.Query("business_no")), + Keyword: strings.TrimSpace(c.Query("keyword")), + Operator: strings.TrimSpace(c.Query("operator")), + ActualOperator: strings.TrimSpace(c.Query("actual_operator")), + StartDate: start, + EndDate: end, } if query.Operator == "" { query.Operator = strings.TrimSpace(c.Query("operator_name")) diff --git a/backend/internal/modules/csmanualentry/dto.go b/backend/internal/modules/csmanualentry/dto.go index 7b8fd0ed..bae5301d 100644 --- a/backend/internal/modules/csmanualentry/dto.go +++ b/backend/internal/modules/csmanualentry/dto.go @@ -6,6 +6,8 @@ import "time" const ( OptionTypePlatform = "platform" // 平台 OptionTypeOperator = "operator" // 操作人 + // OptionTypeDisbursementOperator 线下结算实际操作人;独立于录单操作人。 + OptionTypeDisbursementOperator = "disbursement_operator" ) // 录单组别。 @@ -68,12 +70,12 @@ type PaginatedResult struct { // AgentDayStatsDTO 某客服某日录单统计(按组分列)。 type AgentDayStatsDTO struct { - Date string `json:"date"` // YYYY-MM-DD(北京时间) + Date string `json:"date"` // YYYY-MM-DD(北京时间) AdminID uint64 `json:"admin_id"` AdminName string `json:"admin_name"` - Count int64 `json:"count"` // 总录单量 - CollectCount int64 `json:"collect_count"` // 收号录单量 - SellCount int64 `json:"sell_count"` // 出号录单量 + Count int64 `json:"count"` // 总录单量 + CollectCount int64 `json:"collect_count"` // 收号录单量 + SellCount int64 `json:"sell_count"` // 出号录单量 } // CreateResult 录单结果。 @@ -81,7 +83,7 @@ type CreateResult struct { Entry EntryDTO `json:"entry"` } -// OptionDTO 录单可选项(平台 / 操作人)。 +// OptionDTO 可选项(平台 / 操作人 / 出款实际操作人)。 type OptionDTO struct { ID uint64 `json:"id"` Type string `json:"type"` @@ -91,20 +93,21 @@ type OptionDTO struct { CreatedAt time.Time `json:"created_at"` } -// OptionListDTO 平台与操作人选项集合,供录单表单下拉直接使用。 +// OptionListDTO 平台、操作人与出款实际操作人选项集合。 type OptionListDTO struct { - Platforms []OptionDTO `json:"platforms"` - Operators []OptionDTO `json:"operators"` + Platforms []OptionDTO `json:"platforms"` + Operators []OptionDTO `json:"operators"` + DisbursementOperators []OptionDTO `json:"disbursement_operators"` } -// CreateOptionRequest 新增平台 / 操作人选项。 +// CreateOptionRequest 新增平台 / 操作人 / 出款实际操作人选项。 type CreateOptionRequest struct { Type string `json:"type" binding:"required"` Name string `json:"name" binding:"required"` GroupTag string `json:"group_tag"` // 仅操作人类型可用,collect/sell/空 } -// UpdateOptionRequest 重命名平台 / 操作人选项(可同时更新组别标记)。 +// UpdateOptionRequest 重命名选项(录单操作人可同时更新组别标记)。 type UpdateOptionRequest struct { Name string `json:"name" binding:"required"` GroupTag string `json:"group_tag"` // 仅操作人类型可用,collect/sell/空 diff --git a/backend/internal/modules/csmanualentry/handler.go b/backend/internal/modules/csmanualentry/handler.go index 77c4a277..821d577b 100644 --- a/backend/internal/modules/csmanualentry/handler.go +++ b/backend/internal/modules/csmanualentry/handler.go @@ -49,10 +49,10 @@ func (h *Handler) List(c *gin.Context) { EntryNo: strings.TrimSpace(c.Query("entry_no")), EntryGroup: strings.TrimSpace(c.Query("entry_group")), Keyword: strings.TrimSpace(c.Query("keyword")), - StartDate: strings.TrimSpace(c.Query("start_date")), - EndDate: strings.TrimSpace(c.Query("end_date")), - Page: page, - PageSize: pageSize, + StartDate: strings.TrimSpace(c.Query("start_date")), + EndDate: strings.TrimSpace(c.Query("end_date")), + Page: page, + PageSize: pageSize, } if raw := c.Query("admin_id"); raw != "" { adminID, err := strconv.ParseUint(raw, 10, 64) @@ -123,7 +123,7 @@ func (h *Handler) Delete(c *gin.Context) { response.OK(c, gin.H{"deleted": true}) } -// ListOptions 返回平台与操作人选项,供录单表单下拉使用。 +// ListOptions 返回平台、操作人与出款实际操作人选项。 func (h *Handler) ListOptions(c *gin.Context) { if _, ok := currentAdminID(c); !ok { response.Unauthorized(c, "缺少管理员上下文") @@ -137,7 +137,21 @@ func (h *Handler) ListOptions(c *gin.Context) { response.OK(c, result) } -// CreateOption 新增平台 / 操作人选项。 +// ListDisbursementOperators 返回线下结算实际操作人可选项。 +func (h *Handler) ListDisbursementOperators(c *gin.Context) { + if _, ok := currentAdminID(c); !ok { + response.Unauthorized(c, "缺少管理员上下文") + return + } + result, err := h.service.ListDisbursementOperators(c.Request.Context()) + if err != nil { + writeManualEntryError(c, err) + return + } + response.OK(c, result) +} + +// CreateOption 新增平台 / 操作人 / 出款实际操作人选项。 func (h *Handler) CreateOption(c *gin.Context) { if _, ok := currentAdminID(c); !ok { response.Unauthorized(c, "缺少管理员上下文") @@ -156,7 +170,7 @@ func (h *Handler) CreateOption(c *gin.Context) { response.Created(c, option) } -// UpdateOption 重命名平台 / 操作人选项。 +// UpdateOption 重命名选项。 func (h *Handler) UpdateOption(c *gin.Context) { if _, ok := currentAdminID(c); !ok { response.Unauthorized(c, "缺少管理员上下文") diff --git a/backend/internal/modules/csmanualentry/repository.go b/backend/internal/modules/csmanualentry/repository.go index 0d3f4b56..94cc4623 100644 --- a/backend/internal/modules/csmanualentry/repository.go +++ b/backend/internal/modules/csmanualentry/repository.go @@ -238,7 +238,7 @@ func (r *Repository) ListOptions(ctx context.Context, optionType string) ([]Opti return items, nil } -// ListAllOptions 返回平台与操作人两组可选项,供录单表单直接使用。 +// ListAllOptions 返回平台、操作人与出款实际操作人三组可选项。 func (r *Repository) ListAllOptions(ctx context.Context) (*OptionListDTO, error) { platforms, err := r.ListOptions(ctx, OptionTypePlatform) if err != nil { @@ -248,10 +248,18 @@ func (r *Repository) ListAllOptions(ctx context.Context) (*OptionListDTO, error) if err != nil { return nil, err } - return &OptionListDTO{Platforms: platforms, Operators: operators}, nil + disbursementOperators, err := r.ListOptions(ctx, OptionTypeDisbursementOperator) + if err != nil { + return nil, err + } + return &OptionListDTO{ + Platforms: platforms, + Operators: operators, + DisbursementOperators: disbursementOperators, + }, nil } -// CreateOption 新增一个平台 / 操作人选项,重名返回 ErrOptionExists。 +// CreateOption 新增一个可选项,重名返回 ErrOptionExists。 // 操作人选项可通过 groupTag 标记所属组别(collect/sell,空表示未分组)。 func (r *Repository) CreateOption(ctx context.Context, optionType, name, groupTag string) (*OptionDTO, error) { if !IsValidOptionType(optionType) { @@ -309,7 +317,9 @@ func (r *Repository) DeleteOption(ctx context.Context, id uint64) error { // IsValidOptionType 判断选项类型是否合法。 func IsValidOptionType(optionType string) bool { - return optionType == OptionTypePlatform || optionType == OptionTypeOperator + return optionType == OptionTypePlatform || + optionType == OptionTypeOperator || + optionType == OptionTypeDisbursementOperator } func parseDay(value string, loc *time.Location) (time.Time, error) { diff --git a/backend/internal/modules/csmanualentry/repository_test.go b/backend/internal/modules/csmanualentry/repository_test.go index 7434ccc4..ceaa615a 100644 --- a/backend/internal/modules/csmanualentry/repository_test.go +++ b/backend/internal/modules/csmanualentry/repository_test.go @@ -74,6 +74,10 @@ func TestRepositoryOptionCRUDAndEntryPlatformOperator(t *testing.T) { if err != nil { t.Fatalf("创建操作人选项失败: %v", err) } + disbursementOperator, err := repo.CreateOption(ctx, OptionTypeDisbursementOperator, "出款小王", "") + if err != nil { + t.Fatalf("创建出款实际操作人选项失败: %v", err) + } if _, err := repo.CreateOption(ctx, OptionTypePlatform, "网易大神", ""); !errors.Is(err, ErrOptionExists) { t.Fatalf("重复平台应返回 ErrOptionExists, got %v", err) } @@ -105,6 +109,9 @@ func TestRepositoryOptionCRUDAndEntryPlatformOperator(t *testing.T) { if len(options.Operators) != 2 { t.Fatalf("操作人选项 = %+v, want 2 条", options.Operators) } + if len(options.DisbursementOperators) != 1 || options.DisbursementOperators[0].ID != disbursementOperator.ID { + t.Fatalf("出款实际操作人选项 = %+v, want 1 条", options.DisbursementOperators) + } // 2. 录单写入平台 / 操作人 entry, err := repo.Create(ctx, admin.ID, "客服小张", "cs001", "202610130001", EntryGroupCollect, "网易", "技术测试", "备注1") diff --git a/backend/internal/modules/csmanualentry/service.go b/backend/internal/modules/csmanualentry/service.go index 6ba83e24..1d571c7f 100644 --- a/backend/internal/modules/csmanualentry/service.go +++ b/backend/internal/modules/csmanualentry/service.go @@ -104,7 +104,7 @@ func (s *Service) TodayAgentStats(ctx context.Context) ([]AgentDayStatsDTO, erro return s.repo.TodayAgentStats(ctx, timeutil.ShanghaiNow()) } -// ListOptions 返回平台与操作人两组可选项。 +// ListOptions 返回平台、操作人与出款实际操作人三组可选项。 func (s *Service) ListOptions(ctx context.Context) (*OptionListDTO, error) { if s.repo == nil { return nil, ErrDependencyUnavailable @@ -112,7 +112,15 @@ func (s *Service) ListOptions(ctx context.Context) (*OptionListDTO, error) { return s.repo.ListAllOptions(ctx) } -// CreateOption 新增平台 / 操作人选项。 +// ListDisbursementOperators 返回线下结算实际操作人可选项。 +func (s *Service) ListDisbursementOperators(ctx context.Context) ([]OptionDTO, error) { + if s.repo == nil { + return nil, ErrDependencyUnavailable + } + return s.repo.ListOptions(ctx, OptionTypeDisbursementOperator) +} + +// CreateOption 新增平台 / 操作人 / 出款实际操作人选项。 func (s *Service) CreateOption(ctx context.Context, req CreateOptionRequest) (*OptionDTO, error) { if s.repo == nil { return nil, ErrDependencyUnavailable @@ -135,7 +143,7 @@ func (s *Service) CreateOption(ctx context.Context, req CreateOptionRequest) (*O return s.repo.CreateOption(ctx, optionType, name, groupTag) } -// UpdateOption 重命名平台 / 操作人选项。 +// UpdateOption 重命名选项。 func (s *Service) UpdateOption(ctx context.Context, id uint64, req UpdateOptionRequest) (*OptionDTO, error) { if s.repo == nil { return nil, ErrDependencyUnavailable diff --git a/backend/internal/modules/order/dto.go b/backend/internal/modules/order/dto.go index 3a1bfe5a..13e72c07 100644 --- a/backend/internal/modules/order/dto.go +++ b/backend/internal/modules/order/dto.go @@ -77,6 +77,7 @@ type OrderDTO struct { OfflineSettlementStatus string `json:"offline_settlement_status,omitempty"` OfflineSettlementAmountCent int64 `json:"offline_settlement_amount_cent"` OfflineSettlementRemark string `json:"offline_settlement_remark,omitempty"` + ActualPayoutOperator string `json:"offline_settlement_actual_operator,omitempty"` OfflineSettledBy *uint64 `json:"offline_settled_by,omitempty"` OfflineSettledAt *time.Time `json:"offline_settled_at,omitempty"` RefundStatus string `json:"refund_status,omitempty"` @@ -216,7 +217,8 @@ type ForceHandoffRequest struct { } type OfflineSettlementRequest struct { - Remark string `json:"remark"` + ActualOperator string `json:"actual_operator" binding:"required,max=64"` + Remark string `json:"remark"` } type AdminOrderQuery struct { diff --git a/backend/internal/modules/order/handler_admin.go b/backend/internal/modules/order/handler_admin.go index 3a677f71..7fcb5c85 100644 --- a/backend/internal/modules/order/handler_admin.go +++ b/backend/internal/modules/order/handler_admin.go @@ -4,6 +4,7 @@ import ( "context" "errors" "io" + "strings" "hfb_sys/backend/internal/middleware" "hfb_sys/backend/pkg/response" @@ -177,7 +178,12 @@ func (h *Handler) AdminMarkOfflineSettlement(c *gin.Context) { } var req OfflineSettlementRequest if err := c.ShouldBindJSON(&req); err != nil && !errors.Is(err, io.EOF) { - response.BadRequest(c, "线下结算备注格式不正确") + response.BadRequest(c, "请选择出款实际操作人,并检查结算备注") + return + } + req.ActualOperator = strings.TrimSpace(req.ActualOperator) + if req.ActualOperator == "" { + response.BadRequest(c, "请选择出款实际操作人") return } if err := h.service.AdminMarkOfflineSettlement(c.Request.Context(), adminID, id, req, auditMeta(c)); err != nil { diff --git a/backend/internal/modules/order/platform_managed.go b/backend/internal/modules/order/platform_managed.go index cc2895b8..5e2f07e7 100644 --- a/backend/internal/modules/order/platform_managed.go +++ b/backend/internal/modules/order/platform_managed.go @@ -444,19 +444,24 @@ func (r *Repository) AdminMarkOfflineSettlement(ctx context.Context, adminID uin now := time.Now() order.OfflineSettlementStatus = offlineSettlementStatusSettled order.OfflineSettlementRemark = req.Remark + order.ActualPayoutOperator = req.ActualOperator order.OfflineSettledBy = &adminID order.OfflineSettledAt = &now order.OwnerSettledAt = &now - if err := appendOrderEvent(tx, order, "settlement", "offline_settlement_confirmed", processlog.ActorAdmin, adminID, processlog.ActorUser, &order.OwnerID, "确认已完成线下结算。", req.Remark, map[string]any{"offline_settlement_amount_cent": order.OfflineSettlementAmountCent}, before, nil); err != nil { + if err := appendOrderEvent(tx, order, "settlement", "offline_settlement_confirmed", processlog.ActorAdmin, adminID, processlog.ActorUser, &order.OwnerID, "确认已完成线下结算。", req.Remark, map[string]any{ + "offline_settlement_amount_cent": order.OfflineSettlementAmountCent, + "offline_settlement_actual_operator": order.ActualPayoutOperator, + }, before, nil); err != nil { return err } if err := appendAuditLog(tx, adminID, "order.offline_settlement", "order", order.ID, meta, map[string]any{ - "order_id": order.ID, - "order_no": order.OrderNo, - "before_offline_settlement_status": beforeStatus, - "after_offline_settlement_status": order.OfflineSettlementStatus, - "offline_settlement_amount_cent": order.OfflineSettlementAmountCent, - "remark": req.Remark, + "order_id": order.ID, + "order_no": order.OrderNo, + "before_offline_settlement_status": beforeStatus, + "after_offline_settlement_status": order.OfflineSettlementStatus, + "offline_settlement_amount_cent": order.OfflineSettlementAmountCent, + "offline_settlement_actual_operator": order.ActualPayoutOperator, + "remark": req.Remark, }); err != nil { return err } diff --git a/backend/internal/modules/order/presenter.go b/backend/internal/modules/order/presenter.go index 6c372ad1..5b7930d8 100644 --- a/backend/internal/modules/order/presenter.go +++ b/backend/internal/modules/order/presenter.go @@ -134,6 +134,7 @@ func (row orderRow) toAdminDTO() OrderDTO { OfflineSettlementStatus: effectiveOfflineSettlementStatus(row.RentalOrder), OfflineSettlementAmountCent: row.OfflineSettlementAmountCent, OfflineSettlementRemark: row.OfflineSettlementRemark, + ActualPayoutOperator: row.ActualPayoutOperator, OfflineSettledBy: row.OfflineSettledBy, OfflineSettledAt: row.OfflineSettledAt, RefundStatus: row.RefundStatus, diff --git a/backend/internal/modules/order/process_events.go b/backend/internal/modules/order/process_events.go index 97343fd6..9cd81231 100644 --- a/backend/internal/modules/order/process_events.go +++ b/backend/internal/modules/order/process_events.go @@ -14,8 +14,9 @@ const processBusinessOrder = "order" func orderState(order model.RentalOrder) map[string]any { return map[string]any{ "order_status": order.Status, "handoff_status": order.HandoffStatus, - "settlement_status": order.SettlementStatus, - "offline_settlement_status": effectiveOfflineSettlementStatus(order), + "settlement_status": order.SettlementStatus, + "offline_settlement_status": effectiveOfflineSettlementStatus(order), + "offline_settlement_actual_operator": order.ActualPayoutOperator, } } diff --git a/backend/internal/modules/order/repository_integration_test.go b/backend/internal/modules/order/repository_integration_test.go index c26b5145..448771a6 100644 --- a/backend/internal/modules/order/repository_integration_test.go +++ b/backend/internal/modules/order/repository_integration_test.go @@ -1868,7 +1868,10 @@ func TestPlatformManagedOrderOfflineSettlementFlow(t *testing.T) { t.Fatal("admin dto should expose offline settlement action") } - if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{Remark: "支付宝线下转账"}, AuditMeta{}); err != nil { + if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{ + ActualOperator: "出款小王", + Remark: "支付宝线下转账", + }, AuditMeta{}); err != nil { t.Fatalf("AdminMarkOfflineSettlement() error = %v", err) } if err := db.First(&saved, order.ID).Error; err != nil { @@ -1886,6 +1889,9 @@ func TestPlatformManagedOrderOfflineSettlementFlow(t *testing.T) { if saved.OfflineSettlementRemark != "支付宝线下转账" { t.Fatalf("offline settlement remark = %q", saved.OfflineSettlementRemark) } + if saved.ActualPayoutOperator != "出款小王" { + t.Fatalf("offline settlement actual operator = %q", saved.ActualPayoutOperator) + } if err := db.Model(&model.WalletLedger{}).Where("user_id = ?", owner.ID).Count(&ownerLedgerCount).Error; err != nil { t.Fatalf("recount wallet ledger failed: %v", err) } @@ -1969,7 +1975,10 @@ func TestAdminMarkOfflineSettlementAllowsArbitratedPlatformOrder(t *testing.T) { if !canAdminMarkOfflineSettlement(order) { t.Fatal("arbitrated platform order should allow offline settlement") } - if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{Remark: "仲裁后线下转账"}, AuditMeta{}); err != nil { + if err := repo.AdminMarkOfflineSettlement(t.Context(), adminID, order.ID, OfflineSettlementRequest{ + ActualOperator: "出款小李", + Remark: "仲裁后线下转账", + }, AuditMeta{}); err != nil { t.Fatalf("AdminMarkOfflineSettlement() error = %v", err) } @@ -1983,6 +1992,9 @@ func TestAdminMarkOfflineSettlementAllowsArbitratedPlatformOrder(t *testing.T) { if saved.OfflineSettledBy == nil || *saved.OfflineSettledBy != adminID { t.Fatalf("offline settled by = %#v, want %d", saved.OfflineSettledBy, adminID) } + if saved.ActualPayoutOperator != "出款小李" { + t.Fatalf("offline settlement actual operator = %q", saved.ActualPayoutOperator) + } } func TestPlatformManagedCheckoutIncludesConsumableAndDepositCompensation(t *testing.T) { diff --git a/backend/internal/modules/pickup/dto.go b/backend/internal/modules/pickup/dto.go index c5235fa5..23ebf447 100644 --- a/backend/internal/modules/pickup/dto.go +++ b/backend/internal/modules/pickup/dto.go @@ -86,6 +86,7 @@ type PickupDTO struct { Status string `json:"status"` OfflineSettlementStatus string `json:"offline_settlement_status"` OfflineSettlementRemark string `json:"offline_settlement_remark"` + ActualPayoutOperator string `json:"offline_settlement_actual_operator"` OfflineSettledBy *uint64 `json:"offline_settled_by,omitempty"` OfflineSettledAt *time.Time `json:"offline_settled_at,omitempty"` Remark string `json:"remark"` @@ -129,7 +130,8 @@ type CompleteRequest struct { } type OfflineSettlementRequest struct { - Remark string `json:"remark" binding:"max=255"` + ActualOperator string `json:"actual_operator" binding:"required,max=64"` + Remark string `json:"remark" binding:"max=255"` } type UpdateProfitRequest struct { diff --git a/backend/internal/modules/pickup/handler.go b/backend/internal/modules/pickup/handler.go index 7ce5efa3..50615cf7 100644 --- a/backend/internal/modules/pickup/handler.go +++ b/backend/internal/modules/pickup/handler.go @@ -79,7 +79,12 @@ func (h *Handler) MarkOfflineSettlement(c *gin.Context) { } var req OfflineSettlementRequest if err := c.ShouldBindJSON(&req); err != nil { - response.BadRequest(c, "线下结算备注格式不正确") + response.BadRequest(c, "请选择出款实际操作人,并检查结算备注") + return + } + req.ActualOperator = strings.TrimSpace(req.ActualOperator) + if req.ActualOperator == "" { + response.BadRequest(c, "请选择出款实际操作人") return } item, err := h.service.MarkOfflineSettlement(c.Request.Context(), id, req, adminID, auditMeta(c)) diff --git a/backend/internal/modules/pickup/process_events.go b/backend/internal/modules/pickup/process_events.go index 6fddb953..a541196d 100644 --- a/backend/internal/modules/pickup/process_events.go +++ b/backend/internal/modules/pickup/process_events.go @@ -35,7 +35,8 @@ type ProcessEventDTO struct { func pickupState(row model.AdminPickup) map[string]any { return map[string]any{ "pickup_status": row.Status, "offline_settlement_status": row.OfflineSettlementStatus, - "settlement_mode": row.SettlementMode, + "settlement_mode": row.SettlementMode, + "offline_settlement_actual_operator": row.ActualPayoutOperator, } } diff --git a/backend/internal/modules/pickup/repository.go b/backend/internal/modules/pickup/repository.go index 84450369..adcb56ea 100644 --- a/backend/internal/modules/pickup/repository.go +++ b/backend/internal/modules/pickup/repository.go @@ -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, diff --git a/backend/internal/modules/pickup/repository_test.go b/backend/internal/modules/pickup/repository_test.go index 97f52d92..1abf8c4c 100644 --- a/backend/internal/modules/pickup/repository_test.go +++ b/backend/internal/modules/pickup/repository_test.go @@ -526,7 +526,10 @@ func TestRepositoryCompletePlatformManagedPickupUsesOfflineSettlement(t *testing t.Fatalf("平台代管提号不应生成钱包流水, got %d", ledgerCount) } - settled, err := repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{Remark: "已转账"}, 100, auditlog.Meta{}) + settled, err := repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{ + ActualOperator: "出款小王", + Remark: "已转账", + }, 100, auditlog.Meta{}) if err != nil { t.Fatalf("MarkOfflineSettlement() error = %v", err) } @@ -536,6 +539,9 @@ func TestRepositoryCompletePlatformManagedPickupUsesOfflineSettlement(t *testing if settled.OfflineSettlementRemark != "已转账" { t.Fatalf("线下结算备注 = %q", settled.OfflineSettlementRemark) } + if settled.ActualPayoutOperator != "出款小王" { + t.Fatalf("实际操作人 = %q, want 出款小王", settled.ActualPayoutOperator) + } var audit model.AuditLog if err := db.Where("action = ? AND biz_id = ?", "pickup_offline_settlement", pickup.ID).First(&audit).Error; err != nil { t.Fatalf("确认线下结算应写审计日志: %v", err) @@ -634,7 +640,9 @@ func TestRepositoryFinancialAdjustmentSettlesPlatformManagedPickupSeparately(t * if _, err = repo.Complete(t.Context(), pickup.ID, CompleteRequest{SettleAmountCent: 12000}, 99, auditlog.Meta{}); err != nil { t.Fatalf("Complete() error = %v", err) } - if _, err = repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{}, 100, auditlog.Meta{}); err != nil { + if _, err = repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{ + ActualOperator: "出款甲", + }, 100, auditlog.Meta{}); err != nil { t.Fatalf("MarkOfflineSettlement() error = %v", err) } updated, err := repo.CreateFinancialAdjustment(t.Context(), pickup.ID, FinancialAdjustmentRequest{ @@ -701,7 +709,10 @@ func TestRepositoryOfflineSettlementProcessesPendingPickupAdjustments(t *testing if err != nil || len(adjustments) != 1 || adjustments[0].Status != FinancialAdjustmentStatusPending { t.Fatalf("结算前调整流水 = %+v, %v", adjustments, err) } - settled, err := repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{Remark: "按修正后金额打款"}, 101, auditlog.Meta{}) + settled, err := repo.MarkOfflineSettlement(t.Context(), pickup.ID, OfflineSettlementRequest{ + ActualOperator: "出款乙", + Remark: "按修正后金额打款", + }, 101, auditlog.Meta{}) if err != nil { t.Fatalf("MarkOfflineSettlement() error = %v", err) } diff --git a/backend/internal/router/router.go b/backend/internal/router/router.go index d9337b1e..9f081af5 100644 --- a/backend/internal/router/router.go +++ b/backend/internal/router/router.go @@ -733,6 +733,11 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine { adminRoutes.GET("/dashboard", requirePerm("dashboard:view"), adminDashboardHandler.Summary) adminRoutes.GET("/manual-entries/today-stats", requirePerm("cs_manual_entry:view"), manualEntryHandler.TodayAgentStats) adminRoutes.GET("/manual-entries/options", requirePerm("cs_manual_entry:view"), manualEntryHandler.ListOptions) + adminRoutes.GET( + "/manual-entries/options/disbursement-operators", + requireAnyPerm("cs_manual_entry:view", "order:mark_abnormal", "order:pickup", "wallet:view"), + manualEntryHandler.ListDisbursementOperators, + ) adminRoutes.POST("/manual-entries/options", requirePerm("cs_manual_entry:option_manage"), manualEntryHandler.CreateOption) adminRoutes.PUT("/manual-entries/options/:id", requirePerm("cs_manual_entry:option_manage"), manualEntryHandler.UpdateOption) adminRoutes.DELETE("/manual-entries/options/:id", requirePerm("cs_manual_entry:option_manage"), manualEntryHandler.DeleteOption) diff --git a/backend/migrations/000097_offline_settlement_actual_operator.sql b/backend/migrations/000097_offline_settlement_actual_operator.sql new file mode 100644 index 00000000..08315c9d --- /dev/null +++ b/backend/migrations/000097_offline_settlement_actual_operator.sql @@ -0,0 +1,31 @@ +-- +goose Up + +-- 线下结算实际操作人:保存管理员在确认结算时选择的名称快照。 +-- offline_settled_by 仍保留为执行确认动作的后台账号,两者语义不同。 +ALTER TABLE cs_manual_entry_options + MODIFY COLUMN type VARCHAR(32) NOT NULL COMMENT '选项类型: platform=平台, operator=录单操作人, disbursement_operator=出款实际操作人'; + +ALTER TABLE rental_orders + ADD COLUMN offline_settlement_actual_operator VARCHAR(64) NOT NULL DEFAULT '' + COMMENT '线下结算实际操作人名称快照' AFTER offline_settlement_remark, + ADD KEY idx_rental_orders_actual_operator (offline_settlement_actual_operator); + +ALTER TABLE admin_pickups + ADD COLUMN offline_settlement_actual_operator VARCHAR(64) NOT NULL DEFAULT '' + COMMENT '线下结算实际操作人名称快照' AFTER offline_settlement_remark, + ADD KEY idx_admin_pickups_actual_operator (offline_settlement_actual_operator); + +-- +goose Down + +ALTER TABLE admin_pickups + DROP KEY idx_admin_pickups_actual_operator, + DROP COLUMN offline_settlement_actual_operator; + +ALTER TABLE rental_orders + DROP KEY idx_rental_orders_actual_operator, + DROP COLUMN offline_settlement_actual_operator; + +DELETE FROM cs_manual_entry_options WHERE type = 'disbursement_operator'; + +ALTER TABLE cs_manual_entry_options + MODIFY COLUMN type VARCHAR(16) NOT NULL COMMENT '选项类型: platform=平台, operator=操作人'; diff --git a/frontend/src/features/admin/api/adminFinance.ts b/frontend/src/features/admin/api/adminFinance.ts index c1e8cd34..a0f1e4af 100644 --- a/frontend/src/features/admin/api/adminFinance.ts +++ b/frontend/src/features/admin/api/adminFinance.ts @@ -155,6 +155,7 @@ export interface FinanceDisbursementItem { paid_at?: string operator_id?: number operator_name: string + actual_operator_name: string remark: string category: string custom_category_name: string @@ -204,6 +205,7 @@ export interface FinanceDisbursementQuery extends FinanceDateQuery { operator?: string operator_name?: string operator_id?: string + actual_operator?: string user_id?: string page?: number page_size?: number diff --git a/frontend/src/features/admin/api/adminManualEntry.ts b/frontend/src/features/admin/api/adminManualEntry.ts index 525ed054..bb421364 100644 --- a/frontend/src/features/admin/api/adminManualEntry.ts +++ b/frontend/src/features/admin/api/adminManualEntry.ts @@ -2,8 +2,8 @@ import { apiClient } from '@/shared/api/client' import type { ApiResponse, PaginatedResult } from '@/shared/types/types' -/** 录单可选项类型:平台 / 操作人 */ -export type ManualEntryOptionType = 'platform' | 'operator' +/** 可选项类型:平台 / 录单操作人 / 出款实际操作人 */ +export type ManualEntryOptionType = 'platform' | 'operator' | 'disbursement_operator' /** 录单组别:收号 / 出号 */ export type ManualEntryGroup = 'collect' | 'sell' @@ -34,6 +34,7 @@ export interface ManualEntryOption { export interface ManualEntryOptions { platforms: ManualEntryOption[] operators: ManualEntryOption[] + disbursement_operators: ManualEntryOption[] } export interface ManualEntryAgentStats { @@ -121,6 +122,14 @@ export async function fetchManualEntryOptions() { return data.data } +/** 获取线下结算实际操作人选项。 */ +export async function fetchDisbursementOperators() { + const { data } = await apiClient.get>( + '/admin/manual-entries/options/disbursement-operators' + ) + return data.data +} + export async function createManualEntryOption(payload: { type: ManualEntryOptionType name: string diff --git a/frontend/src/features/admin/api/adminPickup.ts b/frontend/src/features/admin/api/adminPickup.ts index 9f522122..658f7db4 100644 --- a/frontend/src/features/admin/api/adminPickup.ts +++ b/frontend/src/features/admin/api/adminPickup.ts @@ -45,6 +45,7 @@ export interface AdminPickup { status: string offline_settlement_status: PickupOfflineSettlementStatus offline_settlement_remark: string + offline_settlement_actual_operator: string offline_settled_by?: number offline_settled_at?: string remark: string @@ -140,6 +141,7 @@ export interface AdminPickupThirdPartyOrderNoUpdateRequest { } export interface AdminPickupOfflineSettlementRequest { + actual_operator: string remark?: string } @@ -347,7 +349,7 @@ export async function completeAdminPickup(id: number, req: AdminPickupCompleteRe export async function confirmAdminPickupOfflineSettlement( id: number, - req: AdminPickupOfflineSettlementRequest = {} + req: AdminPickupOfflineSettlementRequest ) { const { data } = await apiClient.post>( `/admin/pickups/${id}/offline-settlement`, diff --git a/frontend/src/features/admin/views/AdminFinanceDisbursementsView.vue b/frontend/src/features/admin/views/AdminFinanceDisbursementsView.vue index faf5ee14..b65bcc3c 100644 --- a/frontend/src/features/admin/views/AdminFinanceDisbursementsView.vue +++ b/frontend/src/features/admin/views/AdminFinanceDisbursementsView.vue @@ -156,6 +156,7 @@ const filters = reactive({ business_no: '', keyword: '', operator: '', + actual_operator: '', user_id: '', }) @@ -196,6 +197,7 @@ function resetFilters() { filters.business_no = '' filters.keyword = '' filters.operator = '' + filters.actual_operator = '' filters.user_id = '' currentPage.value = 1 void loadItems() @@ -600,10 +602,18 @@ function accountTypeLabel(type: string) { - + + + + + @@ -722,12 +732,18 @@ function accountTypeLabel(type: string) { - + + + + + - +

- 这里维护的可选项会出现在录单表单的下拉中;删除选项不会影响已登记的历史记录。 - 操作人可设置组别标记(收号/出号),录单选中后自动带出对应组别。 + 录单操作人与出款实际操作人是两套独立配置。出款实际操作人用于平台代管订单和提号确认线下结算; + 删除选项不会影响已保存的历史记录。

@@ -726,6 +748,42 @@ async function handleRemoveOption(item: ManualEntryOption) {

暂无操作人,请先添加

+ +
+
出款实际操作人
+
+ + + 添加 + +
+
    +
  • + {{ item.name }} + + + 重命名 + + + 删除 + + +
  • +
+

+ 暂无可选实际出款人,请先添加 +

+