chore: snapshot production code before Apple Design UI refinement

2026-09-17 18:05:57 +08:00
parent 9f0a87f49e
commit f7e7176f88
90 changed files with 8990 additions and 328 deletions
@@ -5591,10 +5591,18 @@ func (s *Service) DailyMileage(ctx context.Context, query url.Values) (Page[Dail
 	if err != nil {
 		return Page[DailyMileageRow]{}, err
 	}
+	for index := range result.Items {
+		row := &result.Items[index]
+		row.HydrogenPhysicalConsumptionKg = row.HydrogenConsumptionKg
+		row.HydrogenConsumptionKg = row.HydrogenSOCBalancedKg
+		row.HydrogenConsumptionKgPer100Km = correctedDailyHydrogenRate(*row)
+	}
+
 	if !hydrogenConsumptionAllowed(ctx) {
 		for index := range result.Items {
 			result.Items[index].PureHydrogenMileageKm = 0
 			result.Items[index].HydrogenConsumptionKg = nil
+			result.Items[index].HydrogenPhysicalConsumptionKg = nil
 			result.Items[index].HydrogenConsumptionKgPer100Km = nil
 			result.Items[index].HydrogenSOCBalancedKg = nil
 			result.Items[index].HydrogenSOCBalancedKgPer100Km = nil
@@ -6702,3 +6710,16 @@ func boolToInt(value bool) int {
 	}
 	return 0
 }
+
+// correctedDailyHydrogenRate keeps physical consumption available for audit,
+// but never uses it as a fallback for the displayed consumption rate.
+func correctedDailyHydrogenRate(row DailyMileageRow) *float64 {
+	if row.HydrogenSOCBalancedKg == nil {
+		return nil
+	}
+	mileage := row.PureHydrogenMileageKm
+	if row.MixedMileageKm != nil && *row.MixedMileageKm > 0 {
+		mileage = *row.MixedMileageKm
+	}
+	return hydrogenRatePer100Km(*row.HydrogenSOCBalancedKg, mileage, 1)
+}