@seasonkoh/webaz 0.1.28 → 0.1.30

package/dist/pwa/routes/returns.js

@@ -2,6 +2,9 @@ import { recordRepEvent } from '../../layer4-economics/L4-3-reputation/reputatio
 // RFC-016 Phase 1 — 端点校验读/列表读 + 状态翻转/消息/通知单写 → async seam;
 //   executeReturnRefund 退款 db.transaction(钱+库存)与 escalate 建争议 tx 保持同步(Phase 3 迁 pg)。
 import { dbOne, dbAll, dbRun } from '../../layer0-foundation/L0-1-database/db.js';
+// 直付(direct_p2p)退货:物流/协商骨架共用,退款执行环节换成场外握手(零资金零库存回补)。
+//   mark-refunded / confirm-refund 端点在 routes/direct-pay-returns.ts。
+import { enterAwaitRefund, directPayReturnEscalatable, returnRefundRespondDays } from '../../direct-pay-returns.js';
 const VALID_RETURN_REASONS = new Set(['quality', 'wrong_item', 'damaged', 'no_longer_needed', 'other']);
 const RETURN_REASON_DEFAULT_LABEL = {
     quality: '质量问题',
@@ -30,6 +33,26 @@ export function registerReturnsRoutes(app, deps) {
             if (debited.changes !== 1)
                 throw new Error('INSUFFICIENT_SELLER_BALANCE');
             db.prepare('UPDATE wallets SET balance = balance + ? WHERE user_id = ?').run(refundAmt, rr.buyer_id);
+            // RFC-018: reverse this order's in-window clearing commission, proportional to the refund.
+            // These pending rows were never paid (maturation is gated on matures_at), so this is a pure
+            // reversal — no clawback. matures_at IS NOT NULL targets clearing rows only; opt-out escrow
+            // rows (matures_at IS NULL) are untouched. Atomic with the refund.
+            const ordTotal = Number(db.prepare('SELECT total_amount FROM orders WHERE id = ?').get(rr.order_id)?.total_amount ?? 0);
+            const refundFrac = ordTotal > 0 ? Math.min(1, refundAmt / ordTotal) : 1;
+            if (refundFrac >= 1) {
+                db.prepare(`UPDATE pending_commission_escrow SET status='reversed' WHERE order_id = ? AND status='pending' AND matures_at IS NOT NULL`).run(rr.order_id);
+                // RFC-018 PR4: a single FULL return is no longer a genuine sale — decrement the stored product
+                // completion_count (incremented at settleOrder). Idempotent: the return CAS'd to 'refunded'
+                // exactly once above, so this runs once. Partial refund stays a genuine sale (no decrement).
+                // Edge: multiple partial refunds cumulatively reaching full aren't caught here (each refundFrac<1),
+                // so the stored counter may transiently over-count by 1 — but the AUTHORITATIVE genuine count
+                // (genuineSalePredicate, cumulative SUM) is correct everywhere on-read, and the completion_count
+                // backfill (genuine-aware) self-heals the stored counter. completion_count is best-effort social proof.
+                db.prepare(`UPDATE products SET completion_count = MAX(0, COALESCE(completion_count,0) - 1) WHERE id = ?`).run(rr.product_id);
+            }
+            else {
+                db.prepare(`UPDATE pending_commission_escrow SET amount = amount * ? WHERE order_id = ? AND status='pending' AND matures_at IS NOT NULL`).run(1 - refundFrac, rr.order_id);
+            }
             // 3. 恢复库存(CAS + 扣款成功后)
             const ord = db.prepare('SELECT quantity, source, variant_id FROM orders WHERE id = ?').get(rr.order_id);
             if (ord && ord.source !== 'secondhand') {
@@ -69,7 +92,7 @@ export function registerReturnsRoutes(app, deps) {
             return void errorRes(res, 403, 'TRUSTED_ROLE_NO_TRADE', '受信角色无购物功能');
         const order = await dbOne(`
       SELECT o.id, o.buyer_id, o.seller_id, o.product_id, o.status, o.total_amount, o.created_at, o.updated_at,
-             p.return_days, p.title as product_title
+             o.payment_rail, p.return_days, p.title as product_title
       FROM orders o JOIN products p ON p.id = o.product_id
       WHERE o.id = ?
     `, [req.params.order_id]);
@@ -77,7 +100,10 @@ export function registerReturnsRoutes(app, deps) {
             return void res.status(404).json({ error: '订单不存在' });
         if (order.buyer_id !== user.id)
             return void res.status(403).json({ error: '仅买家可申请退货' });
-        // P0-1: 只允许 completed 退货 — escrow 已结算
+        // 直付(Rail1)= 非托管:退货【物流/协商骨架照用】,但退款执行环节换成场外握手(src/direct-pay-returns.ts,
+        //   accept → await_refund → 卖家 mark_refunded → 买家 Passkey confirm → refunded)。零资金零库存回补
+        //   (已出库=B 类,退货验收上架);平台费应收的冲销仍由治理/admin 调整处理(非此路径)。
+        // P0-1: 只允许 completed 退货 — escrow 已结算(直付同口径:确认收货后)
         if (order.status !== 'completed') {
             return void res.status(400).json({ error: '仅订单完成后可申请退货（确认收货后）' });
         }
@@ -90,7 +116,7 @@ export function registerReturnsRoutes(app, deps) {
             return void res.status(400).json({ error: `已超过 ${returnDays} 天退货窗口` });
         }
         const existing = await dbOne(`
-      SELECT id, status FROM return_requests WHERE order_id = ? AND status IN ('pending', 'accepted') LIMIT 1
+      SELECT id, status FROM return_requests WHERE order_id = ? AND status IN ('pending', 'accepted', 'accepted_pickup_pending', 'picked_up', 'await_refund', 'refund_marked') LIMIT 1
     `, [order.id]);
         if (existing)
             return void res.status(400).json({ error: `已存在退货请求 (${existing.status})` });
@@ -196,6 +222,10 @@ export function registerReturnsRoutes(app, deps) {
         const response = req.body?.response ? String(req.body.response).slice(0, 500) : null;
         if (decision === 'reject' && !response)
             return void res.status(400).json({ error: '拒绝时必须填写说明' });
+        // 直付(direct_p2p):同意退货后不走 escrow 钱包退款,进入场外退款握手(await_refund)。取件流照用
+        //   (accepted_pickup_pending → picked_up → received 时再进 await_refund)。
+        const railRow = await dbOne('SELECT payment_rail FROM orders WHERE id = ?', [rr.order_id]);
+        const isDirectPay = railRow?.payment_rail === 'direct_p2p';
         if (decision === 'accept') {
             if (Number(rr.pickup_requested) === 1) {
                 await dbRun(`UPDATE return_requests SET status = 'accepted_pickup_pending', seller_response = ? WHERE id = ?`, [response, rr.id]);
@@ -209,6 +239,16 @@ export function registerReturnsRoutes(app, deps) {
                 catch { }
                 return void res.json({ success: true, status: 'accepted_pickup_pending' });
             }
+            if (isDirectPay) {
+                const r = enterAwaitRefund(db, { returnId: String(rr.id), fromStatus: 'pending', sellerResponse: response, messageId: generateId('rmsg') });
+                if (!r.ok)
+                    return void res.status(409).json({ error: r.error, error_code: r.error_code });
+                try {
+                    await dbRun(`INSERT INTO notifications (id, user_id, type, title, body, order_id) VALUES (?,?,?,?,?,?)`, [generateId('ntf'), rr.buyer_id, 'direct_pay_return_await_refund', '✓ 退货已同意 · 等待卖家场外退款', '直付订单非托管:卖家将在协议外向你退款并声明,请核实到账后在订单页确认(需 Passkey)。卖家超期未退款可升级争议。', rr.order_id]);
+                }
+                catch { }
+                return void res.json({ success: true, status: 'await_refund' });
+            }
             try {
                 executeReturnRefund(rr, response, 'pending');
             }
@@ -377,6 +417,18 @@ export function registerReturnsRoutes(app, deps) {
         if (rr.status !== 'picked_up')
             return void res.status(400).json({ error: `当前状态 ${rr.status}，不可确认（应在 picked_up 状态）` });
         const note = req.body?.note ? String(req.body.note).slice(0, 300) : null;
+        // 直付:收到退货后进入场外退款握手(不走 escrow 钱包退款)
+        const railRow = await dbOne('SELECT payment_rail FROM orders WHERE id = ?', [rr.order_id]);
+        if (railRow?.payment_rail === 'direct_p2p') {
+            const r = enterAwaitRefund(db, { returnId: String(rr.id), fromStatus: 'picked_up', sellerResponse: note, messageId: generateId('rmsg') });
+            if (!r.ok)
+                return void res.status(409).json({ error: r.error, error_code: r.error_code });
+            try {
+                await dbRun(`INSERT INTO notifications (id, user_id, type, title, body, order_id) VALUES (?,?,?,?,?,?)`, [generateId('ntf'), rr.buyer_id, 'direct_pay_return_await_refund', '✓ 卖家已收到退货 · 等待场外退款', '直付订单非托管:卖家将在协议外向你退款并声明,请核实到账后在订单页确认(需 Passkey)。卖家超期未退款可升级争议。', rr.order_id]);
+            }
+            catch { }
+            return void res.json({ success: true, status: 'await_refund' });
+        }
         try {
             executeReturnRefund(rr, note, 'picked_up');
         }
@@ -449,7 +501,11 @@ export function registerReturnsRoutes(app, deps) {
             return void res.status(404).json({ error: '不存在' });
         if (rr.buyer_id !== user.id)
             return void res.status(403).json({ error: '仅买家可升级' });
-        if (rr.status !== 'rejected' && rr.status !== 'pending') {
+        // 直付握手状态可升级:refund_marked 随时(声明≠到账);await_refund 超 respond 窗(卖家同意却不退款)
+        const isDpEsc = ['await_refund', 'refund_marked'].includes(String(rr.status)) && directPayReturnEscalatable(db, rr);
+        if (rr.status !== 'rejected' && rr.status !== 'pending' && !isDpEsc) {
+            if (rr.status === 'await_refund')
+                return void res.status(400).json({ error: `卖家有 ${returnRefundRespondDays(db)} 天场外退款窗口，超期后可升级` });
             return void res.status(400).json({ error: `当前状态 ${rr.status}，无法升级` });
         }
         if (rr.status === 'pending') {

package/dist/pwa/routes/rewards-apply.js

@@ -37,8 +37,10 @@ export function registerRewardsApplyRoutes(app, deps) {
             missing.push(`completed_orders ${completedOrders}/${minOrders}`);
         if (requirePasskey === 1 && passkeyCount === 0)
             missing.push('passkey_not_registered');
-        const pending = (await dbOne("SELECT COUNT(*) AS n, COALESCE(SUM(amount),0) AS total FROM pending_commission_escrow WHERE recipient_user_id = ? AND status = 'pending'", [userId]));
-        const expired = (await dbOne("SELECT COUNT(*) AS n, COALESCE(SUM(amount),0) AS total FROM pending_commission_escrow WHERE recipient_user_id = ? AND status = 'expired'", [userId]));
+        // RFC-018: matures_at IS NULL = opt-out escrow (claimable on activation). Clearing rows
+        // (matures_at NOT NULL) auto-mature via rewards-clearing-mature and must NOT be drained here.
+        const pending = (await dbOne("SELECT COUNT(*) AS n, COALESCE(SUM(amount),0) AS total FROM pending_commission_escrow WHERE recipient_user_id = ? AND status = 'pending' AND matures_at IS NULL", [userId]));
+        const expired = (await dbOne("SELECT COUNT(*) AS n, COALESCE(SUM(amount),0) AS total FROM pending_commission_escrow WHERE recipient_user_id = ? AND status = 'expired' AND matures_at IS NULL", [userId]));
         res.json({
             state,
             opted_in: optIn === 1,
@@ -138,12 +140,15 @@ export function registerRewardsApplyRoutes(app, deps) {
                     VALUES (?, 'activate', ?, ?, ?, ?, ?, ?, ?)`)
                     .run(userId, consent_version, currentMajor.hash, webauthn_token || null, // store gate_token id as audit cross-ref to webauthn_gate_tokens
                 requirePasskey === 1 ? 'passkey' : 'password', sha256_hex(req.ip || '').slice(0, 16), sha256_hex(String(req.headers['user-agent'] || '')).slice(0, 16), now);
-                // Activate batch settle: drain pending escrow to wallet
+                // Activate batch settle: drain OPT-OUT escrow to wallet. RFC-018: matures_at IS NULL excludes
+                // clearing rows — those are NOT claimable on opt-in; they auto-mature after the return window
+                // (rewards-clearing-mature). Draining them here would pay commission early and defeat the
+                // clearing window's reversal guarantee (a returned order could no longer be reversed → clawback).
                 const pending = db.prepare(`SELECT id, amount, attribution_path FROM pending_commission_escrow
-                                    WHERE recipient_user_id = ? AND status = 'pending' AND expires_at > ?`).all(userId, now);
+                                    WHERE recipient_user_id = ? AND status = 'pending' AND matures_at IS NULL AND expires_at > ?`).all(userId, now);
                 let total = 0;
                 for (const p of pending) {
-                    const upd = db.prepare(`UPDATE pending_commission_escrow SET status='settled', settled_at=? WHERE id=? AND status='pending'`).run(now, p.id);
+                    const upd = db.prepare(`UPDATE pending_commission_escrow SET status='settled', settled_at=? WHERE id=? AND status='pending' AND matures_at IS NULL`).run(now, p.id);
                     if (upd.changes === 0)
                         continue; // race: expire cron took it
                     db.prepare(`UPDATE wallets SET balance = balance + ?, earned = earned + ? WHERE user_id = ?`).run(p.amount, p.amount, userId);

package/dist/pwa/routes/rewards-clearing-mature.js

@@ -0,0 +1,96 @@
+// RFC-016 Phase 1 — sweep read → async seam; the per-row pay tx stays sync (Phase 3 → pg).
+import { dbAll } from '../../layer0-foundation/L0-1-database/db.js';
+import { generateId } from '../../layer0-foundation/L0-1-database/schema.js';
+import { applyWalletDelta } from '../../ledger.js';
+import { toUnits, toDecimal } from '../../money.js';
+// #7 Commission source_type (moved from settleCommission). Pure read — stamps commission_records.source_type.
+function commissionSourceType(db, productId, uid) {
+    if (!uid)
+        return 'sponsor';
+    const attr = db.prepare(`SELECT shareable_id FROM product_share_attribution WHERE product_id = ? AND sharer_id = ? AND shareable_id IS NOT NULL ORDER BY created_at DESC LIMIT 1`).get(productId, uid);
+    if (!attr)
+        return 'sponsor';
+    const sh = db.prepare(`SELECT type FROM shareables WHERE id = ?`).get(attr.shareable_id);
+    if (!sh)
+        return 'sponsor';
+    return sh.type === 'note' ? 'note' : 'link';
+}
+/**
+ * Mature ONE clearing commission row. Re-validates genuine closure (completed + no open dispute), then
+ * writes commission_records + credits the wallet in one tx. CAS on status='pending' → idempotent; races
+ * and re-runs lose. Holds (no write) while a dispute is open. Exported for direct unit testing.
+ */
+export function matureClearingRow(db, row) {
+    let outcome = 'skipped';
+    db.transaction(() => {
+        const order = db.prepare("SELECT buyer_id, product_id, snapshot_commission_rate, buyer_region, status FROM orders WHERE id = ?").get(row.order_id);
+        if (!order || order.status !== 'completed') {
+            outcome = 'held';
+            return;
+        } // completed is terminal; defensive hold
+        const openDispute = db.prepare("SELECT 1 FROM disputes WHERE order_id = ? AND status NOT IN ('resolved','dismissed','closed') LIMIT 1").get(row.order_id);
+        if (openDispute) {
+            outcome = 'held';
+            return;
+        } // hold while unresolved (e.g. return escalated to dispute)
+        const claimed = db.prepare("UPDATE pending_commission_escrow SET status='settled', settled_at=? WHERE id=? AND status='pending' AND matures_at IS NOT NULL").run(Date.now(), row.id);
+        if (claimed.changes !== 1) {
+            outcome = 'skipped';
+            return;
+        } // race lost / already settled / reversed
+        const amountU = toUnits(Number(row.amount));
+        if (amountU > 0) {
+            const level = Number(String(row.attribution_path).replace(/^L/, '')) || 0;
+            const rate = Number(order.snapshot_commission_rate ?? 0.10);
+            let region = order.buyer_region || null;
+            if (!region)
+                region = db.prepare("SELECT region FROM users WHERE id = ?").get(order.buyer_id)?.region ?? 'global';
+            const srcType = commissionSourceType(db, order.product_id, row.recipient_user_id);
+            try {
+                db.prepare(`INSERT INTO commission_records (id, order_id, beneficiary_id, source_buyer_id, level, amount, rate, region, source, source_type) VALUES (?,?,?,?,?,?,?,?,?,?)`)
+                    .run(generateId('comm'), row.order_id, row.recipient_user_id, order.buyer_id, level, toDecimal(amountU), rate, region, 'static', srcType);
+            }
+            catch (e) { /* UNIQUE — already recorded on a prior partial run */ }
+            applyWalletDelta(db, row.recipient_user_id, { balance: amountU, earned: amountU });
+        }
+        outcome = 'settled';
+    })();
+    return outcome;
+}
+export async function runClearingMatureSweep(deps) {
+    const { db } = deps;
+    const now = Date.now();
+    const rows = await dbAll(`
+    SELECT id, recipient_user_id, order_id, amount, attribution_path
+    FROM pending_commission_escrow
+    WHERE status = 'pending' AND matures_at IS NOT NULL AND matures_at <= ?
+    ORDER BY matures_at ASC
+    LIMIT 1000
+  `, [now]);
+    let settled = 0, held = 0, skipped = 0;
+    for (const r of rows) {
+        const o = matureClearingRow(db, r);
+        if (o === 'settled')
+            settled++;
+        else if (o === 'held')
+            held++;
+        else
+            skipped++;
+    }
+    return { scanned: rows.length, settled, held, skipped };
+}
+export function startClearingMatureCron(deps) {
+    const ms = 60 * 60 * 1000; // 1h — clearing window granularity is days
+    setInterval(async () => {
+        try {
+            const r = await runClearingMatureSweep(deps);
+            if (r.settled > 0 || r.held > 0) {
+                console.log(`[clearing-mature] scanned ${r.scanned}, settled ${r.settled}, held ${r.held}, skipped ${r.skipped}`);
+            }
+        }
+        catch (e) {
+            console.error('[clearing-mature-cron]', e);
+        }
+    }, ms);
+    console.log('⏳ RFC-018 commission clearing maturation cron 已启动 (每 1h, anchor=matures_at)');
+}

package/dist/pwa/routes/rewards-escrow-expire.js

@@ -3,17 +3,21 @@ import { dbAll } from '../../layer0-foundation/L0-1-database/db.js';
 export async function runEscrowExpireSweep(deps) {
     const { db, redirectToCommissionReserve } = deps;
     const now = Date.now();
+    // RFC-018: pending_commission_escrow now holds TWO lifecycles, discriminated by matures_at:
+    //   - matures_at IS NULL  → opt-out escrow (this cron: expire → commission_reserve / pool).
+    //   - matures_at NOT NULL → clearing rows (the SEPARATE rewards-clearing-mature cron: pay/reverse).
+    // We MUST exclude clearing rows here, or they'd be wrongly expired to the pool instead of paid.
     const rows = await dbAll(`
     SELECT id, recipient_user_id, order_id, amount, attribution_path, expires_at
     FROM pending_commission_escrow
-    WHERE status = 'pending' AND expires_at <= ?
+    WHERE status = 'pending' AND matures_at IS NULL AND expires_at <= ?
     ORDER BY expires_at ASC
     LIMIT 1000
   `, [now]);
     const expired = [];
     for (const r of rows) {
         db.transaction(() => {
-            const upd = db.prepare(`UPDATE pending_commission_escrow SET status='expired', expired_to_charity_at=? WHERE id=? AND status='pending'`).run(now, r.id);
+            const upd = db.prepare(`UPDATE pending_commission_escrow SET status='expired', expired_to_charity_at=? WHERE id=? AND status='pending' AND matures_at IS NULL`).run(now, r.id);
             if (upd.changes === 0)
                 return; // race lost — another sweep already took it
             if (r.attribution_path === 'pv_pair') {

package/dist/pwa/routes/seller-directpay-report.js

@@ -0,0 +1,110 @@
+import { dbOne, dbAll } from '../../layer0-foundation/L0-1-database/db.js';
+// 直付订单状态桶(与状态机一致):已完成(计提平台费)/ 在途 / 已取消·退款。
+const COMPLETED = ['completed', 'confirmed'];
+const IN_FLIGHT = ['pending_accept', 'direct_pay_window', 'accepted', 'shipped', 'picked_up', 'in_transit', 'delivered', 'payment_query', 'direct_expired_unconfirmed'];
+const CLOSED_NEG = ['cancelled', 'expired', 'refunded_full', 'refunded_partial', 'dispute_dismissed', 'resolved_for_seller', 'fault_seller', 'fault_buyer', 'fault_logistics'];
+const inList = (col, arr) => `${col} IN (${arr.map(() => '?').join(',')})`;
+export function registerSellerDirectPayReportRoutes(app, deps) {
+    const { db, auth } = deps;
+    function requireSeller(req, res) {
+        const user = auth(req, res);
+        if (!user)
+            return null;
+        const roles = (() => { try {
+            return JSON.parse(String(user.roles ?? '[]'));
+        }
+        catch {
+            return [];
+        } })();
+        if (user.role !== 'seller' && !(Array.isArray(roles) && roles.includes('seller'))) {
+            res.status(403).json({ error: '仅卖家可查看', error_code: 'SELLER_ONLY' });
+            return null;
+        }
+        return user;
+    }
+    // GET /api/sellers/me/direct-pay-report?from=YYYY-MM-DD&to=YYYY-MM-DD
+    //   from/to 均可选(闭区间,按日期比较 substr(created_at,1,10));返回汇总 + 按月 + 逐单(含平台费明细)。
+    app.get('/api/sellers/me/direct-pay-report', async (req, res) => {
+        const user = requireSeller(req, res);
+        if (!user)
+            return;
+        const sellerId = user.id;
+        const from = typeof req.query.from === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(req.query.from) ? req.query.from : null;
+        const to = typeof req.query.to === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(req.query.to) ? req.query.to : null;
+        const range = [];
+        const rp = [];
+        if (from) {
+            range.push('substr(o.created_at,1,10) >= ?');
+            rp.push(from);
+        }
+        if (to) {
+            range.push('substr(o.created_at,1,10) <= ?');
+            rp.push(to);
+        }
+        const rangeClause = range.length ? ' AND ' + range.join(' AND ') : '';
+        // ① 汇总(单查:订单数 / 销售额 / 各桶计数与已完成销售额)
+        const summary = (await dbOne(`
+      SELECT
+        COUNT(*) as order_count,
+        COALESCE(SUM(o.total_amount), 0) as gross_order_total,
+        SUM(CASE WHEN ${inList('o.status', COMPLETED)} THEN 1 ELSE 0 END) as completed_count,
+        COALESCE(SUM(CASE WHEN ${inList('o.status', COMPLETED)} THEN o.total_amount ELSE 0 END), 0) as completed_sales,
+        SUM(CASE WHEN ${inList('o.status', IN_FLIGHT)} THEN 1 ELSE 0 END) as in_flight_count,
+        SUM(CASE WHEN ${inList('o.status', CLOSED_NEG)} THEN 1 ELSE 0 END) as closed_count
+      FROM orders o
+      WHERE o.seller_id = ? AND o.payment_rail = 'direct_p2p'${rangeClause}
+    `, [...COMPLETED, ...COMPLETED, ...IN_FLIGHT, ...CLOSED_NEG, sellerId, ...rp]));
+        // ② 区间内已计提平台费合计(逐单应收 join 订单,按订单下单日筛)
+        const feeAgg = (await dbOne(`
+      SELECT COALESCE(SUM(r.amount), 0) as fee_accrued, COUNT(*) as fee_count
+      FROM direct_pay_fee_receivables r JOIN orders o ON o.id = r.order_id
+      WHERE o.seller_id = ? AND o.payment_rail = 'direct_p2p'${rangeClause}
+    `, [sellerId, ...rp]));
+        // ③ 按月(最多 24 个月)—— 订单总额(含各状态)与完成单销售额分列,不混
+        const byMonth = await dbAll(`
+      SELECT substr(o.created_at, 1, 7) as month, COUNT(*) as order_count,
+             COALESCE(SUM(o.total_amount), 0) as gross_order_total,
+             COALESCE(SUM(CASE WHEN ${inList('o.status', COMPLETED)} THEN o.total_amount ELSE 0 END), 0) as completed_sales
+      FROM orders o
+      WHERE o.seller_id = ? AND o.payment_rail = 'direct_p2p'${rangeClause}
+      GROUP BY month ORDER BY month DESC LIMIT 24
+    `, [...COMPLETED, sellerId, ...rp]);
+        // ④ 逐单明细(含平台费:LEFT JOIN 应收表 —— 未完成单尚无 fee 行,fee 为 null)。上限 500。
+        const LIMIT = 500;
+        const rows = await dbAll(`
+      SELECT o.id, o.created_at, o.status, o.total_amount, o.ship_to_region, p.title as product_title,
+             r.amount as fee_amount, r.accrued_at as fee_accrued_at
+      FROM orders o
+      LEFT JOIN products p ON p.id = o.product_id
+      LEFT JOIN direct_pay_fee_receivables r ON r.order_id = o.id
+      WHERE o.seller_id = ? AND o.payment_rail = 'direct_p2p'${rangeClause}
+      ORDER BY o.created_at DESC LIMIT ?
+    `, [sellerId, ...rp, LIMIT + 1]);
+        const truncated = rows.length > LIMIT;
+        if (truncated)
+            rows.length = LIMIT;
+        res.setHeader('Cache-Control', 'no-store');
+        res.json({
+            range: { from, to },
+            currency_note: '销售额=下单计价币(买家应付金额);平台服务费=USDC。两者不同币种,分列展示。',
+            summary: {
+                order_count: Number(summary.order_count) || 0,
+                gross_order_total: Number(summary.gross_order_total) || 0, // 所有状态订单总额(含在途/已关闭)—— 非真实销售
+                completed_count: Number(summary.completed_count) || 0,
+                completed_sales: Number(summary.completed_sales) || 0, // 真实销售(仅 completed/confirmed)
+                in_flight_count: Number(summary.in_flight_count) || 0,
+                closed_count: Number(summary.closed_count) || 0,
+                fee_accrued_total: Number(feeAgg.fee_accrued) || 0, // 区间已计提平台费(USDC)
+                fee_order_count: Number(feeAgg.fee_count) || 0,
+            },
+            by_month: byMonth.map(m => ({ month: m.month, order_count: Number(m.order_count) || 0, gross_order_total: Number(m.gross_order_total) || 0, completed_sales: Number(m.completed_sales) || 0 })),
+            orders: rows.map(r => ({
+                id: r.id, created_at: r.created_at, status: r.status, total_amount: Number(r.total_amount) || 0,
+                ship_to_region: r.ship_to_region || null, product_title: r.product_title || null,
+                fee_amount: r.fee_amount == null ? null : Number(r.fee_amount), // null=未完成尚未计提
+                fee_accrued_at: r.fee_accrued_at || null,
+            })),
+            truncated,
+        });
+    });
+}

package/dist/pwa/routes/seller-quota.js

@@ -45,7 +45,7 @@ export function registerSellerQuotaRoutes(app, deps) {
         const d30 = fmt(new Date(now - 30 * 86400000));
         const d60 = fmt(new Date(now - 60 * 86400000));
         const orders = await dbAll(`
-      SELECT o.id, o.product_id, o.buyer_id, o.status, o.total_amount, o.created_at,
+      SELECT o.id, o.product_id, o.buyer_id, o.status, o.total_amount, o.created_at, o.payment_rail,
              COALESCE(p.title, '已下架商品') as product_title,
              COALESCE(ub.name, '匿名') as buyer_name
       FROM orders o
@@ -60,6 +60,8 @@ export function registerSellerQuotaRoutes(app, deps) {
         const inLast30 = orders.filter(o => o.created_at >= d30);
         const inPrev30 = orders.filter(o => o.created_at < d30);
         const gmv = (arr) => arr.filter(o => completedStatuses.has(o.status)).reduce((s, o) => s + Number(o.total_amount || 0), 0);
+        // GMV 按支付轨拆分:托管=平台真实托管收入,直接收款=场外收款(平台不经手)—— 不再混算(诚实口径)
+        const gmvRail = (arr, rail) => arr.filter(o => completedStatuses.has(o.status) && (rail === 'direct_p2p' ? o.payment_rail === 'direct_p2p' : (o.payment_rail || 'escrow') === 'escrow')).reduce((s, o) => s + Number(o.total_amount || 0), 0);
         const curGmv = gmv(inLast30);
         const prevGmv = gmv(inPrev30);
         const curCount = inLast30.length;
@@ -116,6 +118,8 @@ export function registerSellerQuotaRoutes(app, deps) {
             period_days: 30,
             summary: {
                 gmv: curGmv,
+                gmv_escrow: gmvRail(inLast30, 'escrow'),
+                gmv_direct_pay: gmvRail(inLast30, 'direct_p2p'),
                 order_count: curCount,
                 completed_count: completedOrders30.length,
                 aov,