fix: 补 .gitattributes(CRLF for .bat) + README 端口 19540 + 提交 console 锁文件

2026-09-09 20:57:58 +08:00
1 parent c121111f51
commit b80c64a115
@@ -2,12 +2,32 @@ package domain

 import "sort"

+// 榜单排序键，取值与规则包 standings.tieBreak 一致。
+// 定义在 domain 是为了让 rules 包复用同一套键名，避免两边各写一份常量。
+const (
+	TieBreakPoints   = "points"
+	TieBreakGold     = "gold"
+	TieBreakSilver   = "silver"
+	TieBreakBronze   = "bronze"
+	TieBreakTeamCode = "teamCode"
+	TieBreakName     = "name"
+)
+
+// TieBreak 未配置时的口径，与 devdocs 02 §5.2 一致。
+var (
+	defaultTeamTieBreak    = []string{TieBreakPoints, TieBreakGold, TieBreakSilver, TieBreakBronze, TieBreakTeamCode}
+	defaultAthleteTieBreak = []string{TieBreakPoints, TieBreakGold, TieBreakSilver, TieBreakBronze, TieBreakName}
+)
+
 // StandingsInput 是排名聚合的输入：流水 + 名次明细 + 单位/运动员基础信息。
 type StandingsInput struct {
 	Teams    []Team
 	Athletes []Athlete
 	Ledger   []LedgerEntry
 	Ranked   []RankedResult
+	// TieBreak 是排序键顺序（如 points/gold/silver/bronze/teamCode/name）；
+	// 空表示用默认口径。配置里的键优先，其余按默认顺序补齐，保证结果全序。
+	TieBreak []string
 	// IndividualToTeamWeight 个人积分折算进单位总分的系数；<=0 时按 1 处理。
 	IndividualToTeamWeight float64
 	// ExcludeTeamEventMedals 为 true 时团体奖牌榜不计团体项目奖牌；默认计入。
@@ -33,7 +53,7 @@ func rankMedal(rank int) int {
 }

 // BuildTeamStandings 生成总积分榜。
-// 总分 = Σ(仅记单位的流水) + 系数 × Σ(记到个人的流水)；排序：总分 → 金 → 银 → 铜 → 单位编码。
+// 总分 = Σ(仅记单位的流水) + 系数 × Σ(记到个人的流水)；排序按 in.TieBreak，缺省为总分 → 金 → 银 → 铜 → 单位编码。
 func BuildTeamStandings(in StandingsInput) []StandingsRow {
 	weight := effectiveWeight(in.IndividualToTeamWeight)
 	sums := SumByTeam(in.Ledger, weight)
@@ -62,7 +82,7 @@ func BuildTeamStandings(in StandingsInput) []StandingsRow {
 		}
 	}

-	sort.SliceStable(rows, func(i, j int) bool { return lessTeamRow(rows[i], rows[j]) })
+	sort.SliceStable(rows, func(i, j int) bool { return lessTeamRow(rows[i], rows[j], in.TieBreak) })
 	for i := range rows {
 		rows[i].Rank = i + 1
 	}
@@ -92,7 +112,7 @@ func BuildMedalStandings(in StandingsInput) []MedalRow {
 }

 // BuildAthleteStandings 生成个人积分奖牌榜。
-// 排序：总分 → 金 → 银 → 铜 → 姓名；个人榜的奖牌只统计个人项目（团体项目奖牌归团体榜）。
+// 排序按 in.TieBreak，缺省为总分 → 金 → 银 → 铜 → 姓名；个人榜的奖牌只统计个人项目（团体项目奖牌归团体榜）。
 func BuildAthleteStandings(in StandingsInput) []AthleteStandingsRow {
 	points := SumByAthlete(in.Ledger)
 	medals := athleteMedals(in)
@@ -154,7 +174,7 @@ func BuildAthleteStandings(in StandingsInput) []AthleteStandingsRow {
 		})
 	}

-	sort.SliceStable(rows, func(i, j int) bool { return lessAthleteRow(rows[i], rows[j]) })
+	sort.SliceStable(rows, func(i, j int) bool { return lessAthleteRow(rows[i], rows[j], in.TieBreak) })
 	for i := range rows {
 		rows[i].Rank = i + 1
 	}
@@ -237,43 +257,91 @@ func athleteMedals(in StandingsInput) map[int64]medalTally {
 	return out
 }

-func lessTeamRow(a, b StandingsRow) bool {
-	if !nearlyEqual(a.Points, b.Points) {
-		return a.Points > b.Points
+// tieBreakKeys 把配置的排序键展开成实际比较顺序：配置优先，缺失的默认键补在后面，
+// 保证两行在所有键上都相等时仍能由调用方的 ID 兜底分出先后。
+func tieBreakKeys(cfg, def []string) []string {
+	if len(cfg) == 0 {
+		return def
 	}
-	if a.Gold != b.Gold {
-		return a.Gold > b.Gold
+	out := make([]string, 0, len(cfg)+len(def))
+	seen := make(map[string]bool, len(cfg)+len(def))
+	for _, key := range cfg {
+		if seen[key] {
+			continue
+		}
+		seen[key] = true
+		out = append(out, key)
 	}
-	if a.Silver != b.Silver {
-		return a.Silver > b.Silver
+	for _, key := range def {
+		if seen[key] {
+			continue
+		}
+		seen[key] = true
+		out = append(out, key)
 	}
-	if a.Bronze != b.Bronze {
-		return a.Bronze > b.Bronze
-	}
-	if a.Code != b.Code {
-		return a.Code < b.Code
+	return out
+}
+
+func lessTeamRow(a, b StandingsRow, tieBreak []string) bool {
+	for _, key := range tieBreakKeys(tieBreak, defaultTeamTieBreak) {
+		switch key {
+		case TieBreakPoints:
+			if !nearlyEqual(a.Points, b.Points) {
+				return a.Points > b.Points
+			}
+		case TieBreakGold:
+			if a.Gold != b.Gold {
+				return a.Gold > b.Gold
+			}
+		case TieBreakSilver:
+			if a.Silver != b.Silver {
+				return a.Silver > b.Silver
+			}
+		case TieBreakBronze:
+			if a.Bronze != b.Bronze {
+				return a.Bronze > b.Bronze
+			}
+		case TieBreakTeamCode:
+			if a.Code != b.Code {
+				return a.Code < b.Code
+			}
+		case TieBreakName:
+			if a.Name != b.Name {
+				return a.Name < b.Name
+			}
+		}
 	}
 	return a.TeamID < b.TeamID
 }

-func lessAthleteRow(a, b AthleteStandingsRow) bool {
-	if !nearlyEqual(a.Points, b.Points) {
-		return a.Points > b.Points
-	}
-	if a.Gold != b.Gold {
-		return a.Gold > b.Gold
-	}
-	if a.Silver != b.Silver {
-		return a.Silver > b.Silver
-	}
-	if a.Bronze != b.Bronze {
-		return a.Bronze > b.Bronze
-	}
-	if a.Name != b.Name {
-		return a.Name < b.Name
-	}
-	if a.TeamCode != b.TeamCode {
-		return a.TeamCode < b.TeamCode
+func lessAthleteRow(a, b AthleteStandingsRow, tieBreak []string) bool {
+	for _, key := range tieBreakKeys(tieBreak, defaultAthleteTieBreak) {
+		switch key {
+		case TieBreakPoints:
+			if !nearlyEqual(a.Points, b.Points) {
+				return a.Points > b.Points
+			}
+		case TieBreakGold:
+			if a.Gold != b.Gold {
+				return a.Gold > b.Gold
+			}
+		case TieBreakSilver:
+			if a.Silver != b.Silver {
+				return a.Silver > b.Silver
+			}
+		case TieBreakBronze:
+			if a.Bronze != b.Bronze {
+				return a.Bronze > b.Bronze
+			}
+		case TieBreakTeamCode:
+			if a.TeamCode != b.TeamCode {
+				return a.TeamCode < b.TeamCode
+			}
+		case TieBreakName:
+			if a.Name != b.Name {
+				return a.Name < b.Name
+			}
+		}
 	}
 	return a.AthleteID < b.AthleteID
 }