From ad66ae5f10aa5581089cbe2139328c7fd1958312 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 9 Nov 2026 09:56:06 +0800 Subject: [PATCH] fix: apply quota point conversion --- .env.example | 2 +- README.md | 14 ++++- package.json | 3 +- public/admin.html | 2 +- public/admin.js | 2 +- public/checkout.html | 2 +- public/checkout.js | 9 +-- scripts/migrate-quota-scale.ts | 27 ++++++++ src/external-db.ts | 112 +++++++++++++++++++++++++++++++-- src/quota.ts | 19 ++++++ src/server.ts | 15 +++-- tests/quota.test.ts | 23 +++++++ 12 files changed, 205 insertions(+), 25 deletions(-) create mode 100644 scripts/migrate-quota-scale.ts create mode 100644 src/quota.ts create mode 100644 tests/quota.test.ts diff --git a/.env.example b/.env.example index ff655d3..03b03fe 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,7 @@ ADMIN_PASSWORD=admin123456 PAY_MASTER_KEY= # 本地联调业务回调时可设为 true;生产环境请保持 false,避免 SSRF。 ALLOW_PRIVATE_CALLBACKS=false -# 外部 PostgreSQL 用于读取 users,并在支付确认后由服务端原子增加 users.quota;Docker Compose 内可设 postgres +# 外部 PostgreSQL 用于读取 users;1 积分对应 5000 quota,支付确认后服务端按此比例原子更新 users.quota;Docker Compose 内可设 postgres EXTERNAL_POSTGRES_HOST=localhost EXTERNAL_POSTGRES_PORT=5432 EXTERNAL_POSTGRES_DATABASE=new-api diff --git a/README.md b/README.md index 842f345..fafc40c 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ sign = HMAC-SHA256(merchant_secret, content).hex() ## 支付成功业务回调 -支付页只轮询本平台订单状态,不直接修改业务数据。支付宝、微信等渠道经服务端查单或验签通知确认实付成功后,服务端先按订单绑定的用户 ID 原子增加 PostgreSQL `users.quota`;只有积分入账成功,订单才会变为 `paid` 并返回充值成功。业务入账使用独立的唯一订单流水表 `multipay_recharge_credits`,重复通知和重复轮询不会重复增加积分。 +支付页只轮询本平台订单状态,不直接修改业务数据。支付宝、微信等渠道经服务端查单或验签通知确认实付成功后,服务端先按订单绑定的用户 ID 原子增加 PostgreSQL `users.quota`;换算比例固定为 `1 积分 = 5000 quota`,页面积分按 `Math.ceil(quota / 5000)` 显示。只有积分入账成功,订单才会变为 `paid` 并返回充值成功。业务入账使用独立的唯一订单流水表 `multipay_recharge_credits`,重复通知和重复轮询不会重复增加积分。 平台向 `notify_url` 发送 JSON: @@ -103,7 +103,7 @@ sign = HMAC-SHA256(merchant_secret, content).hex() - 后台“用户管理”用于创建和停用本地用户,并查看积分余额、成功充值次数和累计金额。 - 后台“充值套餐”可配置套餐名称、显示金额、到账积分、启用状态和展示顺序。 -- 支付渠道确认成功后,服务端将套餐积分增加到 PostgreSQL `users.quota`;入账成功后才向支付页返回成功。 +- 支付渠道确认成功后,服务端按“套餐积分 × 5000”增加 PostgreSQL `users.quota`;入账成功后才向支付页返回成功。 - 每个支付订单只允许生成一条业务入账流水;支付平台重复通知和页面重复轮询不会重复增加积分。 - 收银台默认展示该用户最近六个月的成功充值记录。 - 初始演示用户为 `demo-user`,仅用于本地验收,正式使用时请创建业务用户并停用演示用户。 @@ -112,10 +112,18 @@ sign = HMAC-SHA256(merchant_secret, content).hex() - 充值记录中的已支付订单可以由管理员发起原路全额退款。 - 管理员可选择是否回退积分;默认回退该订单充值时到账的积分,也可以填写其他非负整数。 -- 支付渠道确认退款后,服务端按订单绑定的用户 ID 从 PostgreSQL `users.quota` 扣减积分,网页不会直接操作业务数据库。 +- 支付渠道确认退款后,服务端按“回退积分 × 5000”从订单用户的 PostgreSQL `users.quota` 扣减额度,网页不会直接操作业务数据库。 - 退款请求号与积分回退流水均按订单保持唯一;重复点击、网络重试或渠道重复响应不会重复退款、重复扣减积分。 - 微信退款处于处理中时,可在充值记录中点击“查询退款”继续确认状态。 +历史版本曾按 `1 积分 = 1 quota` 写入流水。升级后在 PostgreSQL 可连接时执行一次: + +```powershell +bun run migrate:quota-scale +``` + +脚本只修复能够通过本地订单明确验证的旧比例流水;已经符合 5000 倍比例的数据会跳过,其他不一致会停止并回滚。 + ## 官方支付配置 ### 支付宝 diff --git a/package.json b/package.json index 46d1618..fb9f5fa 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "dev": "bun --watch src/server.ts", "start": "bun src/server.ts", - "test": "bun test" + "test": "bun test", + "migrate:quota-scale": "bun scripts/migrate-quota-scale.ts" }, "dependencies": { "pg": "^8.23.1", diff --git a/public/admin.html b/public/admin.html index 12389bf..2fec5f8 100644 --- a/public/admin.html +++ b/public/admin.html @@ -20,6 +20,6 @@
- + diff --git a/public/admin.js b/public/admin.js index 24c4ad2..275b78b 100644 --- a/public/admin.js +++ b/public/admin.js @@ -33,7 +33,7 @@ function openRefund(order,search=''){ openModal(); } function wireFilters(fn){$('#filters').onsubmit=e=>{e.preventDefault();fn(new URLSearchParams(new FormData(e.target)).toString())}} -async function renderUsers(search=''){const d=await api(`/api/admin/users?search=${encodeURIComponent(search)}`);$('#content').innerHTML=`

用户管理

数据来源:PostgreSQL users 表;支付确认后由服务端自动增加 quota 积分。

${d.rows.length?d.rows.map(u=>``).join(''):empty(7)}
用户 ID用户名可用积分累计已使用成功充值累计金额同步时间
${esc(u.id)}${esc(u.username||u.display_name)}${Number(u.quota||0).toLocaleString('zh-CN')}${Number(u.used_quota||0).toLocaleString('zh-CN')}${u.paid_orders||0} 笔${fmtMoney(u.paid_cents)}${fmtTime(u.updated_at)}
`;$('#userSearch').onsubmit=e=>{e.preventDefault();renderUsers(new FormData(e.target).get('search')||'')}} +async function renderUsers(search=''){const d=await api(`/api/admin/users?search=${encodeURIComponent(search)}`);$('#content').innerHTML=`

用户管理

数据来源:PostgreSQL users 表;每 1 积分对应 5000 quota。

${d.rows.length?d.rows.map(u=>``).join(''):empty(7)}
用户 ID用户名可用积分累计已使用成功充值累计金额同步时间
${esc(u.id)}${esc(u.username||u.display_name)}${Number(u.points_balance||0).toLocaleString('zh-CN')}${Number(u.used_points||0).toLocaleString('zh-CN')}${u.paid_orders||0} 笔${fmtMoney(u.paid_cents)}${fmtTime(u.updated_at)}
`;$('#userSearch').onsubmit=e=>{e.preventDefault();renderUsers(new FormData(e.target).get('search')||'')}} function openUser(user={}){const isNew=!user.id;$('#modalContent').innerHTML=`${isNew?'新增':'编辑'}用户

用户资料

`;const form=$('#userForm');form.onsubmit=async e=>{e.preventDefault();const f=new FormData(form);const id=f.get('id');try{await api(`/api/admin/users/${encodeURIComponent(id)}`,{method:'PUT',body:JSON.stringify({...Object.fromEntries(f),enabled:f.has('enabled')})});closeModal();toast('用户已保存');renderUsers()}catch(err){toast(err.message,'error')}};openModal()} async function renderPackages(){const d=await api('/api/admin/packages');$('#content').innerHTML=`

充值套餐

配置前台显示的充值金额、到账积分和展示顺序。

${d.rows.map(p=>`
${esc(p.name)}${fmtMoney(p.amount_cents)}

到账 ${Number(p.points).toLocaleString('zh-CN')} 积分

排序 ${p.sort_order} · ${p.enabled?'已启用':'已停用'}
`).join('')}
`;$('#addPackage').onclick=()=>openPackage();document.querySelectorAll('[data-package]').forEach(b=>b.onclick=()=>openPackage(d.rows.find(p=>String(p.id)===b.dataset.package)))} function openPackage(pkg={}){const isNew=!pkg.id;$('#modalContent').innerHTML=`${isNew?'新增':'编辑'}充值套餐

套餐配置

`;const form=$('#packageForm');form.onsubmit=async e=>{e.preventDefault();const f=new FormData(form);try{await api(`/api/admin/packages/${pkg.id||'new'}`,{method:'PUT',body:JSON.stringify({...Object.fromEntries(f),enabled:f.has('enabled')})});closeModal();toast('充值套餐已保存');renderPackages()}catch(err){toast(err.message,'error')}};openModal()} diff --git a/public/checkout.html b/public/checkout.html index bcfac05..af89a72 100644 --- a/public/checkout.html +++ b/public/checkout.html @@ -48,6 +48,6 @@
充值时间订单号支付渠道充值金额获得积分
- + diff --git a/public/checkout.js b/public/checkout.js index 0afaff3..9bb2c3f 100644 --- a/public/checkout.js +++ b/public/checkout.js @@ -14,10 +14,7 @@ function showInvalidUser(value) { $('#userGate').classList.add('hidden'); $('#ch function channelName(channel) { return ({ alipay: '支付宝', wechat: '微信支付', mock: '本地模拟' })[channel] || channel; } function channelIcon(channel) { return channel === 'alipay' ? '支' : channel === 'wechat' ? '微' : 'M'; } function formatTime(value) { return new Date(value).toLocaleString('zh-CN', { hour12: false }); } -function formatAvailablePoints(value) { - const quota = Number(value ?? 0); - return Math.ceil((Number.isFinite(quota) ? quota : 0) / 5000).toLocaleString('zh-CN'); -} +function formatAvailablePoints(value) { return Number(value ?? 0).toLocaleString('zh-CN'); } function syncAmount() { const amount = state.selectedPackage ? (state.selectedPackage.amount_cents / 100).toFixed(2) : '0.00'; @@ -63,7 +60,7 @@ async function init() { const response = await fetch(`/api/checkout/users/${encodeURIComponent(userId)}`); const data = await response.json(); if (!response.ok) return showInvalidUser(userId); state.user = data.user; state.packages = data.packages; - $('#userName').textContent = data.user.username || data.user.displayName; $('#userAvatar').textContent = (data.user.username || data.user.displayName || data.user.id).slice(0, 1).toUpperCase(); $('#pointsBalance').textContent = formatAvailablePoints(data.user.quota); + $('#userName').textContent = data.user.username || data.user.displayName; $('#userAvatar').textContent = (data.user.username || data.user.displayName || data.user.id).slice(0, 1).toUpperCase(); $('#pointsBalance').textContent = formatAvailablePoints(data.user.pointsBalance); renderPackages(); renderHistory(data.history); await loadGateways(); syncAmount(); $('#userGate').classList.add('hidden'); $('#checkoutMain').classList.remove('hidden'); $('#historyPanel').classList.remove('hidden'); } catch { showInvalidUser(userId); } @@ -101,7 +98,7 @@ async function checkStatus() { async function refreshUserBalance() { try { const data = await fetch(`/api/checkout/users/${encodeURIComponent(state.user.id)}`).then((response) => response.json()); - if (data.user) { state.user = { ...state.user, ...data.user }; $('#pointsBalance').textContent = formatAvailablePoints(data.user.quota); } + if (data.user) { state.user = { ...state.user, ...data.user }; $('#pointsBalance').textContent = formatAvailablePoints(data.user.pointsBalance); } } catch { /* 保留最后一次已加载的额度 */ } } diff --git a/scripts/migrate-quota-scale.ts b/scripts/migrate-quota-scale.ts new file mode 100644 index 0000000..f9ef347 --- /dev/null +++ b/scripts/migrate-quota-scale.ts @@ -0,0 +1,27 @@ +import { db, initializeDatabase } from "../src/db"; +import { closeExternalDatabase, repairLegacyQuotaMappings } from "../src/external-db"; + +await initializeDatabase(); + +try { + const rows = db.query(`SELECT id, user_id, points, refund_points, refund_points_enabled + FROM orders + WHERE user_id IS NOT NULL AND user_id <> '' + AND (points_credited=1 OR refund_status='success' OR status='refunded')`).all() as Array<{ + id: string; + user_id: string; + points: number; + refund_points: number; + refund_points_enabled: number; + }>; + const result = await repairLegacyQuotaMappings(rows.map((row) => ({ + orderId: String(row.id), + userId: String(row.user_id), + points: Number(row.points || 0), + refundPoints: row.refund_points_enabled ? Number(row.refund_points || 0) : 0 + }))); + console.log(`quota 映射迁移完成:修复入账 ${result.creditsRepaired} 条,修复退款 ${result.refundsRepaired} 条。`); +} finally { + await closeExternalDatabase(); + db.close(); +} diff --git a/src/external-db.ts b/src/external-db.ts index 446e351..0275ddb 100644 --- a/src/external-db.ts +++ b/src/external-db.ts @@ -1,4 +1,5 @@ import pg from "pg"; +import { pointsToQuota } from "./quota"; const pool = new pg.Pool({ host: process.env.EXTERNAL_POSTGRES_HOST || "localhost", @@ -38,6 +39,13 @@ export type ExternalQuotaRefund = { providerRefundNo: string; }; +export type LegacyQuotaRepairOrder = { + orderId: string; + userId: string; + points: number; + refundPoints: number; +}; + let creditTableReady: Promise | null = null; let refundTableReady: Promise | null = null; @@ -109,6 +117,7 @@ export async function searchExternalUsers(search = ""): Promise export async function creditExternalUserQuota(input: ExternalQuotaCredit): Promise { if (!Number.isSafeInteger(input.points) || input.points < 0) throw new Error("充值积分必须是非负整数"); if (!input.orderId || !input.providerTradeNo) throw new Error("业务入账缺少支付订单标识"); + const quotaDelta = pointsToQuota(input.points); await ensureCreditTable(); const client = await pool.connect(); try { @@ -122,7 +131,7 @@ export async function creditExternalUserQuota(input: ExternalQuotaCredit): Promi VALUES ($1, $2, $3::bigint, $4) ON CONFLICT (order_id) DO NOTHING RETURNING user_id, quota_delta, provider_trade_no`, - [input.orderId, input.userId, input.points, input.providerTradeNo]); + [input.orderId, input.userId, quotaDelta, input.providerTradeNo]); if (!inserted.rowCount) { const existing = await client.query<{ @@ -134,10 +143,23 @@ export async function creditExternalUserQuota(input: ExternalQuotaCredit): Promi const credit = existing.rows[0]; if (!credit || credit.user_id !== input.userId - || toNumber(credit.quota_delta) !== input.points || credit.provider_trade_no !== input.providerTradeNo) { throw new Error("订单已存在不一致的业务入账记录"); } + const storedQuotaDelta = toNumber(credit.quota_delta); + if (storedQuotaDelta !== quotaDelta) { + if (storedQuotaDelta !== input.points) throw new Error("订单已存在不一致的业务入账记录"); + const correction = quotaDelta - storedQuotaDelta; + const repaired = await client.query<{ quota: unknown }>( + `UPDATE users SET quota = COALESCE(quota, 0) + $2::bigint + WHERE id::text = $1 RETURNING quota`, [input.userId, correction]); + if (!repaired.rows[0]) throw new Error("业务用户不存在,历史积分映射未修复"); + await client.query( + "UPDATE multipay_recharge_credits SET quota_delta=$2::bigint WHERE order_id=$1", + [input.orderId, quotaDelta]); + await client.query("COMMIT"); + return { credited: true, quota: toNumber(repaired.rows[0].quota) }; + } const user = await client.query<{ quota: unknown }>( "SELECT quota FROM users WHERE id::text = $1 LIMIT 1", [input.userId]); if (!user.rows[0]) throw new Error("业务用户不存在"); @@ -147,7 +169,7 @@ export async function creditExternalUserQuota(input: ExternalQuotaCredit): Promi const updated = await client.query<{ quota: unknown }>( `UPDATE users SET quota = COALESCE(quota, 0) + $2::bigint - WHERE id::text = $1 RETURNING quota`, [input.userId, input.points]); + WHERE id::text = $1 RETURNING quota`, [input.userId, quotaDelta]); if (!updated.rows[0]) throw new Error("业务用户不存在,积分未入账"); await client.query("COMMIT"); return { credited: true, quota: toNumber(updated.rows[0].quota) }; @@ -162,6 +184,7 @@ export async function creditExternalUserQuota(input: ExternalQuotaCredit): Promi export async function refundExternalUserQuota(input: ExternalQuotaRefund): Promise { if (!Number.isSafeInteger(input.points) || input.points < 0) throw new Error("回退积分必须是非负整数"); if (!input.orderId || !input.providerRefundNo) throw new Error("积分回退缺少退款标识"); + const quotaDelta = pointsToQuota(input.points); await ensureRefundTable(); const client = await pool.connect(); try { @@ -170,15 +193,29 @@ export async function refundExternalUserQuota(input: ExternalQuotaRefund): Promi `INSERT INTO multipay_refund_debits (order_id, user_id, quota_delta, provider_refund_no) VALUES ($1, $2, $3::bigint, $4) ON CONFLICT (order_id) DO NOTHING RETURNING user_id, quota_delta, provider_refund_no`, - [input.orderId, input.userId, input.points, input.providerRefundNo]); + [input.orderId, input.userId, quotaDelta, input.providerRefundNo]); if (!inserted.rowCount) { const existing = await client.query<{ user_id: string; quota_delta: unknown; provider_refund_no: string }>( `SELECT user_id, quota_delta, provider_refund_no FROM multipay_refund_debits WHERE order_id=$1`, [input.orderId]); const debit = existing.rows[0]; - if (!debit || debit.user_id !== input.userId || toNumber(debit.quota_delta) !== input.points + if (!debit || debit.user_id !== input.userId || debit.provider_refund_no !== input.providerRefundNo) { throw new Error("订单已存在不一致的积分回退记录"); } + const storedQuotaDelta = toNumber(debit.quota_delta); + if (storedQuotaDelta !== quotaDelta) { + if (storedQuotaDelta !== input.points) throw new Error("订单已存在不一致的积分回退记录"); + const correction = quotaDelta - storedQuotaDelta; + const repaired = await client.query<{ quota: unknown }>( + `UPDATE users SET quota=COALESCE(quota,0)-$2::bigint + WHERE id::text=$1 RETURNING quota`, [input.userId, correction]); + if (!repaired.rows[0]) throw new Error("业务用户不存在,历史积分回退映射未修复"); + await client.query( + "UPDATE multipay_refund_debits SET quota_delta=$2::bigint WHERE order_id=$1", + [input.orderId, quotaDelta]); + await client.query("COMMIT"); + return { credited: true, quota: toNumber(repaired.rows[0].quota) }; + } const user = await client.query<{ quota: unknown }>("SELECT quota FROM users WHERE id::text=$1 LIMIT 1", [input.userId]); if (!user.rows[0]) throw new Error("业务用户不存在"); await client.query("COMMIT"); @@ -186,7 +223,7 @@ export async function refundExternalUserQuota(input: ExternalQuotaRefund): Promi } const updated = await client.query<{ quota: unknown }>( `UPDATE users SET quota=COALESCE(quota,0)-$2::bigint WHERE id::text=$1 RETURNING quota`, - [input.userId, input.points]); + [input.userId, quotaDelta]); if (!updated.rows[0]) throw new Error("业务用户不存在,积分未回退"); await client.query("COMMIT"); return { credited: true, quota: toNumber(updated.rows[0].quota) }; @@ -198,6 +235,69 @@ export async function refundExternalUserQuota(input: ExternalQuotaRefund): Promi } } +export async function repairLegacyQuotaMappings(orders: LegacyQuotaRepairOrder[]) { + if (!orders.length) return { creditsRepaired: 0, refundsRepaired: 0 }; + await Promise.all([ensureCreditTable(), ensureRefundTable()]); + const client = await pool.connect(); + let creditsRepaired = 0; + let refundsRepaired = 0; + try { + await client.query("BEGIN"); + for (const order of orders) { + const expectedCredit = pointsToQuota(order.points); + const creditResult = await client.query<{ user_id: string; quota_delta: unknown }>( + "SELECT user_id, quota_delta FROM multipay_recharge_credits WHERE order_id=$1", + [order.orderId]); + const credit = creditResult.rows[0]; + if (credit) { + if (credit.user_id !== order.userId) throw new Error(`订单 ${order.orderId} 的入账用户不一致`); + const storedCredit = toNumber(credit.quota_delta); + if (storedCredit !== expectedCredit) { + if (storedCredit !== order.points) throw new Error(`订单 ${order.orderId} 的入账额度不是可识别的旧格式`); + const correction = expectedCredit - storedCredit; + const updated = await client.query( + "UPDATE users SET quota=COALESCE(quota,0)+$2::bigint WHERE id::text=$1", + [order.userId, correction]); + if (!updated.rowCount) throw new Error(`订单 ${order.orderId} 对应的业务用户不存在`); + await client.query( + "UPDATE multipay_recharge_credits SET quota_delta=$2::bigint WHERE order_id=$1", + [order.orderId, expectedCredit]); + creditsRepaired += 1; + } + } + + if (order.refundPoints <= 0) continue; + const expectedRefund = pointsToQuota(order.refundPoints); + const refundResult = await client.query<{ user_id: string; quota_delta: unknown }>( + "SELECT user_id, quota_delta FROM multipay_refund_debits WHERE order_id=$1", + [order.orderId]); + const refund = refundResult.rows[0]; + if (!refund) continue; + if (refund.user_id !== order.userId) throw new Error(`订单 ${order.orderId} 的退款用户不一致`); + const storedRefund = toNumber(refund.quota_delta); + if (storedRefund !== expectedRefund) { + if (storedRefund !== order.refundPoints) throw new Error(`订单 ${order.orderId} 的退款额度不是可识别的旧格式`); + const correction = expectedRefund - storedRefund; + const updated = await client.query( + "UPDATE users SET quota=COALESCE(quota,0)-$2::bigint WHERE id::text=$1", + [order.userId, correction]); + if (!updated.rowCount) throw new Error(`订单 ${order.orderId} 对应的业务用户不存在`); + await client.query( + "UPDATE multipay_refund_debits SET quota_delta=$2::bigint WHERE order_id=$1", + [order.orderId, expectedRefund]); + refundsRepaired += 1; + } + } + await client.query("COMMIT"); + return { creditsRepaired, refundsRepaired }; + } catch (error) { + await client.query("ROLLBACK").catch(() => {}); + throw error; + } finally { + client.release(); + } +} + export async function closeExternalDatabase() { await pool.end(); } diff --git a/src/quota.ts b/src/quota.ts new file mode 100644 index 0000000..079653b --- /dev/null +++ b/src/quota.ts @@ -0,0 +1,19 @@ +export const QUOTA_PER_POINT = 5000; + +export function pointsToQuota(points: unknown): number { + const value = Number(points); + if (!Number.isSafeInteger(value) || value < 0) { + throw new Error("积分必须是非负安全整数"); + } + const quota = value * QUOTA_PER_POINT; + if (!Number.isSafeInteger(quota)) { + throw new Error("积分换算后的 quota 超出安全整数范围"); + } + return quota; +} + +export function quotaToPoints(quota: unknown): number { + const value = Number(quota ?? 0); + if (!Number.isFinite(value)) return 0; + return Math.ceil(value / QUOTA_PER_POINT); +} diff --git a/src/server.ts b/src/server.ts index 0c7c314..b753c59 100644 --- a/src/server.ts +++ b/src/server.ts @@ -10,6 +10,7 @@ import { import { isIP } from "node:net"; import { lookup } from "node:dns/promises"; import { creditExternalUserQuota, getExternalUser, refundExternalUserQuota, searchExternalUsers, type ExternalUser } from "./external-db"; +import { pointsToQuota, quotaToPoints } from "./quota"; await initializeDatabase(); @@ -78,11 +79,12 @@ function getGateway(id: string): GatewayRecord | null { function syncExternalUser(user: ExternalUser) { const now = new Date().toISOString(); + const pointsBalance = quotaToPoints(user.quota); db.transaction(() => { db.query(`INSERT INTO users (id, display_name, points_balance, enabled, created_at, updated_at) - VALUES (?, ?, 0, 1, ?, ?) ON CONFLICT(id) DO UPDATE SET - display_name=excluded.display_name, updated_at=excluded.updated_at`) - .run(user.id, user.username, now, now); + VALUES (?, ?, ?, 1, ?, ?) ON CONFLICT(id) DO UPDATE SET + display_name=excluded.display_name, points_balance=excluded.points_balance, updated_at=excluded.updated_at`) + .run(user.id, user.username, pointsBalance, now, now); db.query(`INSERT INTO external_user_links (local_user_id, external_user_id, external_username, last_synced_at) VALUES (?, ?, ?, ?) ON CONFLICT(local_user_id) DO UPDATE SET @@ -397,8 +399,9 @@ const server = Bun.serve({ id: externalUser.id, displayName: externalUser.username, username: externalUser.username, - pointsBalance: externalUser.quota, + pointsBalance: quotaToPoints(externalUser.quota), quota: externalUser.quota, + usedPoints: quotaToPoints(externalUser.usedQuota), usedQuota: externalUser.usedQuota }, packages, @@ -661,8 +664,9 @@ const server = Bun.serve({ id: user.id, display_name: user.username, username: user.username, - points_balance: user.quota, + points_balance: quotaToPoints(user.quota), quota: user.quota, + used_points: quotaToPoints(user.usedQuota), used_quota: user.usedQuota, enabled: 1, updated_at: link?.last_synced_at || new Date().toISOString(), @@ -689,6 +693,7 @@ const server = Bun.serve({ const name = String(input.name || "充值套餐").trim().slice(0, 60); const amountCents = moneyToCents(input.amount); const points = Math.max(0, Math.floor(Number(input.points) || 0)); + pointsToQuota(points); const sortOrder = Math.floor(Number(input.sort_order) || 0); const now = new Date().toISOString(); const rawId = decodeURIComponent(packageAdminMatch[1]); diff --git a/tests/quota.test.ts b/tests/quota.test.ts new file mode 100644 index 0000000..81c90c9 --- /dev/null +++ b/tests/quota.test.ts @@ -0,0 +1,23 @@ +import { describe, expect, test } from "bun:test"; +import { pointsToQuota, quotaToPoints, QUOTA_PER_POINT } from "../src/quota"; + +describe("quota mapping", () => { + test("uses 5000 quota units for one point", () => { + expect(QUOTA_PER_POINT).toBe(5000); + expect(pointsToQuota(1)).toBe(5000); + expect(pointsToQuota(520)).toBe(2_600_000); + }); + + test("rounds displayed points upward", () => { + expect(quotaToPoints(0)).toBe(0); + expect(quotaToPoints(1)).toBe(1); + expect(quotaToPoints(5000)).toBe(1); + expect(quotaToPoints(5001)).toBe(2); + }); + + test("rejects invalid point values", () => { + expect(() => pointsToQuota(-1)).toThrow(); + expect(() => pointsToQuota(1.5)).toThrow(); + expect(() => pointsToQuota(Number.MAX_SAFE_INTEGER)).toThrow(); + }); +});