diff --git a/src/server/routes/energy/index.ts b/src/server/routes/energy/index.ts index e7b5a7e..d8115c2 100644 --- a/src/server/routes/energy/index.ts +++ b/src/server/routes/energy/index.ts @@ -23,16 +23,16 @@ const HYDROGEN_MIN_DATE = '2024-01-01'; // hydrogen_fuel_ledger.refuel_time 已是业务本地时间字面值,直接使用即可(不再 +8 小时) const HYDROGEN_TABLE = 'hydrogen_fuel_ledger'; const HYDROGEN_LOCAL = `refuel_time`; -const HYDROGEN_BASE_WHERE = `del_flag = '0' AND is_duplicate = 0`; -const HYDROGEN_BASE_WHERE_B = `b.del_flag = '0' AND b.is_duplicate = 0`; +const HYDROGEN_BASE_WHERE = `del_flag = '0'`; +const HYDROGEN_BASE_WHERE_B = `b.del_flag = '0'`; const ELECTRIC_LOCAL = `charging_start_time`; type CustomerKind = 'external' | 'lingniu' | 'all'; -// 新账本没有旧表 truck_id 空/非空口径;按客户是否计费区分:计费=外部,未计费=羚牛承担。 +// 新账本 hydrogen_fuel_ledger 当前只承载羚牛车辆订单;外部车辆数据源待接入。 function customerClause(customer: CustomerKind): string { - if (customer === 'external') return `(COALESCE(customer_price, 0) > 0 OR COALESCE(fee_total, 0) > 0)`; - if (customer === 'lingniu') return `(COALESCE(customer_price, 0) <= 0 AND COALESCE(fee_total, 0) <= 0)`; + if (customer === 'external') return '1=0'; + if (customer === 'lingniu') return '1=1'; return '1=1'; } @@ -416,7 +416,7 @@ app.get('/hydrogen/daily', async (c) => { date, totalKg: info ? Math.round(info.totalKg * 100) / 100 : 0, chainPct: dayChainPct.get(date) ?? 0, - customerType: customer === 'lingniu' ? 'lingniu' : 'external', + customerType: customer, stations: info ? info.stations.slice().sort((a, b) => b.kg - a.kg).map(s => ({ name: s.name,