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
@@ -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,
@@ -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])
}
}
+14 -12
View File
@@ -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"`
@@ -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"))