fix: preserve legacy channel parent names
This commit is contained in:
@@ -126,10 +126,17 @@ func TestChannelHTTPListsMetricsOptionsAndAtomicCreation(t *testing.T) {
|
|||||||
t.Fatal("主渠道不见了")
|
t.Fatal("主渠道不见了")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
row := rootRow(list(8, "", 2))
|
firstPage := list(8, "", 2)
|
||||||
if row["gameCount"] != float64(1) || row["playerCount"] != float64(1) || row["totalPayAmount"] != "30.30" || row["busierDisplayName"] != "sdk-account(leaf)" {
|
row := rootRow(firstPage)
|
||||||
|
if row["gameCount"] != float64(1) || row["playerCount"] != float64(1) || row["totalPayAmount"] != "30.30" || row["busierDisplayName"] != "sdk-account(leaf)" || row["parentName"] != "" {
|
||||||
t.Fatalf("默认偏好或展示字段错误: %+v", row)
|
t.Fatalf("默认偏好或展示字段错误: %+v", row)
|
||||||
}
|
}
|
||||||
|
for _, raw := range firstPage["rows"].([]any) {
|
||||||
|
child := raw.(map[string]any)
|
||||||
|
if child["id"] == "101" && child["parentName"] != "main-channel" {
|
||||||
|
t.Fatalf("父级名称应保留渠道原始值: %+v", child)
|
||||||
|
}
|
||||||
|
}
|
||||||
if err := db.Exec("INSERT INTO sys_user_preference(user_id,include_sub_promote,idcard_dedup) VALUES(8,1,0)").Error; err != nil {
|
if err := db.Exec("INSERT INTO sys_user_preference(user_id,include_sub_promote,idcard_dedup) VALUES(8,1,0)").Error; err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,12 +61,6 @@ func (c *Channel) BusinessDisplayName() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *Channel) ParentDisplayName() string {
|
func (c *Channel) ParentDisplayName() string {
|
||||||
if c.Level != nil && *c.Level == 1 {
|
|
||||||
if len(c.BusinessPath) > 0 {
|
|
||||||
return c.BusinessPath[len(c.BusinessPath)-1]
|
|
||||||
}
|
|
||||||
return c.BusinessDisplayName()
|
|
||||||
}
|
|
||||||
return c.ParentName
|
return c.ParentName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ func TestChannelPortraitKeepsContactAndCooperationStatusSeparateFromAudit(t *tes
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
b := result.Basic
|
b := result.Basic
|
||||||
if b.LockStatusLabel != sample.label || b.StatusLabel != "正常" || b.Phone != channel.Phone || b.SettlementDays == nil || *b.SettlementDays != 7 || b.BusierDisplayName != "SDK商务(所属商务)" || b.ParentPromoteName == nil || *b.ParentPromoteName != "所属商务" {
|
if b.LockStatusLabel != sample.label || b.StatusLabel != "正常" || b.Phone != channel.Phone || b.SettlementDays == nil || *b.SettlementDays != 7 || b.BusierDisplayName != "SDK商务(所属商务)" || b.ParentPromoteName != nil {
|
||||||
t.Fatalf("portrait metadata or status mismatch: %+v", b)
|
t.Fatalf("portrait metadata or status mismatch: %+v", b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user