feat(billing): 支付 P5.1 —— 订单骨架 + 兑换码渠道全闭环
按 PAYMENT_DESIGN.md 施工。零资质渠道先把「订单→入账→对账」的骨架跑真， 微信 Native(P5.2)进来只是多一个 adapter。 - store/payment.go:CreditPack(admin 可配包)/PaymentOrder(支付侧事实源,兑换 也写单,全部充值一个查法)/RedeemCode(SDX-XXXX-XXXX-XXXX,crypto/rand,剔除 易混字符)。三模型都不标 isTenantScoped——订单归计费租户,与活跃租户可能 分叉,插件自动注入会写错归属(RecentRuns 同款教训),显式赋值+显式过滤。 - Redeem 单事务:码 CAS 占用(unused→used 只成功一次,幂等主闸)→建已支付 订单→账本分录+物化余额。credit_ledger 加 (kind,ref) 部分唯一索引兜底 ——GrantCredits 此前对 ref 零约束,回调 at-least-once 就是重复入账事故。 - 路由:/billing/packs|orders(查,全员) + /billing/redeem(≥member+审计); admin /redeem-codes(生成/列表) + /packs(配包)。 - Web 面账单页:兑换码输入(viewer 不摆输入框,真闸在后端)+最近充值订单流。 - 测试:码形态/200 样本无撞码/参数边界;go+tsc+vitest 全绿。 live 13 项:生成→核销余额精确+100→重core 400(主闸)→DB 直插重复 ref 被唯一 索引打回(兜底闸实证)→viewer 403→balance==SUM(ledger) 不变量→审计留痕→ 浏览器 UI 兑换 100→200+订单流展示。 已知余项:admin 生成码暂只有 API(admin 页 UI 下一刀);微信 adapter=P5.2。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blizzard
@@ -246,6 +246,36 @@ export async function myUsage(days = 30): Promise<MyUsage> {
|
||||
};
|
||||
}
|
||||
|
||||
// ---- 充值（P5.1 兑换码；微信支付 P5.2 上线）----
|
||||
export interface TopupOrder {
|
||||
id: string;
|
||||
credits_micro: number;
|
||||
amount_fen: number;
|
||||
channel: string;
|
||||
status: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
// redeemCode 核销兑换码，返回入账后的余额。
|
||||
export async function redeemCode(code: string): Promise<{ balance_micro: number }> {
|
||||
const res = guard401(
|
||||
await fetch(`${GATEWAY}/api/v1/billing/redeem`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json", ...bearer() },
|
||||
body: JSON.stringify({ code }),
|
||||
}),
|
||||
);
|
||||
return jsonOrThrow<{ balance_micro: number }>(res, "兑换失败");
|
||||
}
|
||||
|
||||
// billingOrders 计费租户最近充值记录。
|
||||
export async function billingOrders(): Promise<TopupOrder[]> {
|
||||
const res = guard401(await fetch(`${GATEWAY}/api/v1/billing/orders`, { headers: bearer() }));
|
||||
if (!res.ok) return [];
|
||||
const d = (await res.json()) as { orders?: TopupOrder[] };
|
||||
return d.orders ?? [];
|
||||
}
|
||||
|
||||
// 积分显示：micro(1e6) → 人类可读。与桌面端同一约定；小数去尾零（1.50 → 1.5）。
|
||||
export function fmtCredits(micro: number): string {
|
||||
const v = micro / 1e6;
|
||||
|
||||
@@ -1,19 +1,43 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Coins, ReceiptText } from "lucide-react";
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { Coins, ReceiptText, Ticket } from "lucide-react";
|
||||
import { useTenant } from "../shell/AppShell";
|
||||
import { myUsage, fmtCredits, type MyUsage } from "../api";
|
||||
import { Badge, Panel, Table, Tr, Td, cn } from "../ui";
|
||||
import { myUsage, redeemCode, billingOrders, fmtCredits, type MyUsage, type TopupOrder } from "../api";
|
||||
import { Badge, Button, Input, Panel, Table, Tr, Td, cn, useToast } from "../ui";
|
||||
|
||||
// 用量与账单：余额 + 消耗趋势 + 区间合计 + 最近消耗（数据全部来自 /me/usage）。
|
||||
// 充值本期只有说明占位——支付是 P5，先不做假入口。
|
||||
// 用量与账单：余额 + 兑换码充值(P5.1) + 消耗趋势 + 最近消耗/充值。
|
||||
// 微信扫码支付在 P5.2 挂上（渠道适配器已留位），此前不做假支付入口。
|
||||
export function Usage() {
|
||||
const { ctx } = useTenant();
|
||||
const toast = useToast();
|
||||
const { ctx, refresh } = useTenant();
|
||||
const [days, setDays] = useState(7);
|
||||
const [u, setU] = useState<MyUsage | null>(null);
|
||||
const [orders, setOrders] = useState<TopupOrder[]>([]);
|
||||
const [code, setCode] = useState("");
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const load = useCallback(() => {
|
||||
myUsage(days).then(setU).catch(() => {});
|
||||
}, [days, ctx?.tenant?.id]);
|
||||
billingOrders().then(setOrders).catch(() => {});
|
||||
}, [days]);
|
||||
useEffect(load, [load, ctx?.tenant?.id]);
|
||||
|
||||
const canTopup = ctx?.role !== "viewer"; // 真闸在后端(≥member)，这里只是不摆没用的输入框
|
||||
|
||||
const redeem = async () => {
|
||||
if (!code.trim() || busy) return;
|
||||
setBusy(true);
|
||||
try {
|
||||
const r = await redeemCode(code.trim());
|
||||
toast.push("success", `已入账，当前余额 ${fmtCredits(r.balance_micro)} 积分`);
|
||||
setCode("");
|
||||
load();
|
||||
refresh(); // 顶栏/概览的余额也跟着变
|
||||
} catch (e) {
|
||||
toast.push("error", (e as Error).message);
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
const maxTok = Math.max(...(u?.trend.map((d) => d.total_tok) ?? []), 1);
|
||||
const fmtTok = (n: number) => (n >= 1e6 ? `${(n / 1e6).toFixed(1)}M` : n >= 1e3 ? `${(n / 1e3).toFixed(1)}K` : `${n}`);
|
||||
@@ -39,9 +63,28 @@ export function Usage() {
|
||||
<Badge tone="danger">余额不足，任务提交将被拒绝</Badge>
|
||||
) : null}
|
||||
</div>
|
||||
<p className="mt-3 text-[11px] leading-relaxed text-slate-600">
|
||||
充值暂由平台管理员处理，在线支付即将上线。如需增加额度，请联系你的服务对接人。
|
||||
</p>
|
||||
{canTopup ? (
|
||||
<div className="mt-4 border-t border-line pt-4">
|
||||
<div className="mb-2 flex items-center gap-1.5 text-xs font-medium text-slate-400">
|
||||
<Ticket className="h-3.5 w-3.5" /> 兑换码充值
|
||||
</div>
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<Input
|
||||
className="w-56 font-mono uppercase placeholder:font-sans placeholder:normal-case"
|
||||
value={code}
|
||||
onChange={(e) => setCode(e.target.value)}
|
||||
onKeyDown={(e) => e.key === "Enter" && redeem()}
|
||||
placeholder="SDX-XXXX-XXXX-XXXX"
|
||||
/>
|
||||
<Button variant="primary" onClick={redeem} disabled={busy || !code.trim()}>
|
||||
{busy ? "入账中…" : "兑换"}
|
||||
</Button>
|
||||
<span className="text-[11px] text-slate-600">微信扫码支付即将上线；兑换码请向平台获取。</span>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<p className="mt-3 text-[11px] text-slate-600">你是只读角色，充值请联系组织管理员。</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 趋势 */}
|
||||
@@ -90,6 +133,26 @@ export function Usage() {
|
||||
</Table>
|
||||
{(!u || u.recent.length === 0) && <p className="p-4 text-xs text-slate-600">暂无消耗记录。</p>}
|
||||
</Panel>
|
||||
|
||||
{/* 最近充值（订单流：兑换码与将来的微信支付一个查法） */}
|
||||
{orders.length > 0 && (
|
||||
<Panel title="最近充值" icon={Ticket} bodyClassName="p-0">
|
||||
<Table cols={["时间", "渠道", "积分", "状态"]}>
|
||||
{orders.map((o) => (
|
||||
<Tr key={o.id}>
|
||||
<Td><span className="text-xs text-slate-400">{new Date(o.created_at).toLocaleString()}</span></Td>
|
||||
<Td><span className="text-xs text-slate-300">{o.channel === "redeem" ? "兑换码" : o.channel === "wechat" ? "微信支付" : o.channel}</span></Td>
|
||||
<Td><span className="text-xs tabular-nums text-slate-200">+{fmtCredits(o.credits_micro)}</span></Td>
|
||||
<Td>
|
||||
<Badge tone={o.status === "paid" ? "success" : o.status === "pending" ? "warn" : "danger"}>
|
||||
{o.status === "paid" ? "已入账" : o.status === "pending" ? "待支付" : o.status}
|
||||
</Badge>
|
||||
</Td>
|
||||
</Tr>
|
||||
))}
|
||||
</Table>
|
||||
</Panel>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user