diff --git a/src/modules/energy/HydrogenDaily.tsx b/src/modules/energy/HydrogenDaily.tsx
index e37c59c..39ac03f 100644
--- a/src/modules/energy/HydrogenDaily.tsx
+++ b/src/modules/energy/HydrogenDaily.tsx
@@ -197,9 +197,9 @@ export default function HydrogenDaily() {
>
{s.name}
- · {s.pricePerKg == null ? '—' : s.pricePerKg}
+ · {s.pricePerKg}
- {s.pricePerKg == null ? '—' : s.pricePerKg}
+ {s.pricePerKg}
{s.kg.toLocaleString('zh-CN', { maximumFractionDigits: 2 })}
diff --git a/src/modules/energy/types.ts b/src/modules/energy/types.ts
index a2d6b08..5c3f4c7 100644
--- a/src/modules/energy/types.ts
+++ b/src/modules/energy/types.ts
@@ -31,7 +31,7 @@ export interface HydrogenRegionShare {
export interface HydrogenStationRow {
name: string;
- pricePerKg: number | null;
+ pricePerKg: number;
kg: number;
chainPct: number;
}
diff --git a/src/server/routes/energy/index.ts b/src/server/routes/energy/index.ts
index 072144c..2fb28d0 100644
--- a/src/server/routes/energy/index.ts
+++ b/src/server/routes/energy/index.ts
@@ -175,8 +175,8 @@ app.get('/hydrogen/daily', async (c) => {
CASE WHEN b.hydrogen_station_id IS NULL THEN '未关联站点'
ELSE CONCAT('未知站点 #', b.hydrogen_station_id) END) AS stationName,
ROUND(SUM(b.hydrogen_quantity), 2) AS kg,
- CASE WHEN MIN(b.cost_price) = MAX(b.cost_price) THEN MIN(b.cost_price)
- ELSE NULL END AS pricePerKg
+ -- 单价:直接取订单中的成本价(不重算)。MAX 自然忽略 0 元的免费/赠送单
+ MAX(b.cost_price) AS pricePerKg
FROM tab_energy_hydrogen_bill b
LEFT JOIN tab_hydrogen_site s ON s.id = b.hydrogen_station_id
LEFT JOIN tab_outside_hydrogen_site os ON os.inner_site_id = b.hydrogen_station_id
@@ -188,13 +188,13 @@ app.get('/hydrogen/daily', async (c) => {
// 站点环比:同站点上一条记录的 kg
// 按 stationId 分组、按日期升序计算
- type StationRow = { date: string; stationId: number; name: string; kg: number; pricePerKg: number | null };
+ type StationRow = { date: string; stationId: number; name: string; kg: number; pricePerKg: number };
const flat: StationRow[] = stationRows.map(r => ({
date: r.d as string,
stationId: Number(r.stationId),
name: r.stationName as string,
kg: Number(r.kg) || 0,
- pricePerKg: r.pricePerKg == null ? null : Number(r.pricePerKg),
+ pricePerKg: Number(r.pricePerKg) || 0,
}));
// 计算日级总量 + 日级环比
@@ -244,7 +244,7 @@ app.get('/hydrogen/daily', async (c) => {
.sort((a, b) => b.kg - a.kg)
.map(s => ({
name: s.name,
- pricePerKg: s.pricePerKg == null ? null : Math.round(s.pricePerKg * 100) / 100,
+ pricePerKg: Math.round(s.pricePerKg * 100) / 100,
kg: Math.round(s.kg * 100) / 100,
chainPct: stationChain.get(`${s.date}|${s.stationId}`) ?? 0,
})),