diff --git a/internal/biz/business/channel.go b/internal/biz/business/channel.go index f1b489c..b1c4e52 100644 --- a/internal/biz/business/channel.go +++ b/internal/biz/business/channel.go @@ -49,9 +49,7 @@ type Channel struct { } func (c *Channel) BusinessDisplayName() string { - if len(c.BusinessPath) > 0 { - return strings.Join(c.BusinessPath, "→") - } + // 沿用旧商务系统:显示绑定的平台商务账号及当前商务登录名。 account, user := strings.TrimSpace(c.BindingAccount), strings.TrimSpace(c.BindingUserName) if account == "" { return user diff --git a/internal/data/business/channel_test.go b/internal/data/business/channel_test.go index d0af428..1b63485 100644 --- a/internal/data/business/channel_test.go +++ b/internal/data/business/channel_test.go @@ -112,7 +112,7 @@ func TestChannelListMatchesBindingsAndLiteralBusinessKeyword(t *testing.T) { t.Fatalf("指定商务应只取本人绑定: %+v %v", page, err) } for _, row := range page.Rows { - if row.SourceDB != "lx" || row.BusierUserID == nil || *row.BusierUserID != 9 || row.BusinessDisplayName() != "parent→branch→leaf" { + if row.SourceDB != "lx" || row.BusierUserID == nil || *row.BusierUserID != 9 || row.BusinessDisplayName() != "lx-business(leaf)" { t.Fatalf("归属展示错误: %+v", row) } } diff --git a/internal/service/business/channel_portrait_test.go b/internal/service/business/channel_portrait_test.go index 8c6d6c8..a01177e 100644 --- a/internal/service/business/channel_portrait_test.go +++ b/internal/service/business/channel_portrait_test.go @@ -20,14 +20,14 @@ func TestChannelPortraitKeepsContactAndCooperationStatusSeparateFromAudit(t *tes status int label string }{{0, "正常"}, {-1, "锁定"}, {-2, "解除合作"}} { - channel := &business.Channel{ChannelKey: business.ChannelKey{SourceDB: "lx", ID: 100}, Account: "渠道账号", Level: &level, Status: &auditStatus, LockStatus: &sample.status, Phone: "13812345678", SettlementDays: &days, BusinessPath: []string{"一级商务", "所属商务"}} + channel := &business.Channel{ChannelKey: business.ChannelKey{SourceDB: "lx", ID: 100}, Account: "渠道账号", Level: &level, Status: &auditStatus, LockStatus: &sample.status, Phone: "13812345678", SettlementDays: &days, BindingAccount: "SDK商务", BindingUserName: "所属商务", BusinessPath: []string{"一级商务", "所属商务"}} service := &ChannelPortraitService{uc: channelPortraitTransportFake{&business.ChannelPortrait{Basic: &business.ChannelPortraitBasic{Channel: channel}}}} result, err := service.Portrait(context.Background(), &dto.ChannelPortraitQuery{SourceDB: "lx", PromoteID: 100}) if err != nil { t.Fatal(err) } b := result.Basic - if b.LockStatusLabel != sample.label || b.StatusLabel != "正常" || b.Phone != channel.Phone || b.SettlementDays == nil || *b.SettlementDays != 7 || b.BusierDisplayName != "一级商务→所属商务" || 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 || *b.ParentPromoteName != "所属商务" { t.Fatalf("portrait metadata or status mismatch: %+v", b) } }