koishi-plugin-prism 0.1.23 → 0.1.28

package/README.md

@@ -8,7 +8,7 @@
 
 * 🎮 **玩家入场与结算**：通过 `/login` 和 `/logout` 指令开启或结算计费场次，支持 `/入场` 别名；命令回复会引用触发消息，结账账单可私聊通知管理员与指定用户。
 * 💳 **账户钱包与资产管理**：支持查询钱包余额（`/wallet`）和持有的道具资产（`/items`）。
-* 🀄 **麻将桌位集成**：包含 `/mahjong <tableId>`、`/上桌 <桌号>`、自动识别当前桌位的 `/下桌`，以及用于查看桌名、别名和状态的 `/麻将列表`。`上桌` 仅允许已通过 `login`/`入场` 开启默认入场会话的玩家使用。`list` 按 session 标签分组：有非音乐游戏 session 的玩家归入最新的非音乐标签，纯音乐玩家归入音乐标签；麻将桌额外显示当前人数和容量。已开局桌位会从后端活跃 session 自动恢复，未满桌候座仍由机器人进程暂存，重启后不会保留。
+* 🀄 **麻将桌位集成**：包含 `/mahjong <tableId>`、`/上桌 <桌号>`、自动识别当前桌位的 `/下桌`，以及用于查看桌名、别名和状态的 `/麻将列表`。`上桌` 仅允许已通过 `login`/`入场` 开启默认入场会话的玩家使用。支持在桌位未满但已开局时进行中途补位（直接开始计费上桌），且玩家下桌时会自动显示剩余游玩人数。`list` 按 session 标签分组：有非音乐游戏 session 的玩家归入最新的非音乐标签，纯音乐玩家归入音乐标签；麻将桌额外显示当前人数和容量。已开局桌位会从后端活跃 session 自动恢复，未满桌候座仍由机器人进程暂存，重启后不会保留。
 * 🔌 **硬件设备状态与电源管理**：可直接在聊天中查看设备状态（`/show`）、远程开启/关闭电源（`/on`、`/off`）、远程投币（`/coin`）和模拟刷卡（`/scan`）。
 * 🎟️ **礼物兑换码**：使用 `/redeem <code>` 兑换系统发放的福利礼包。
 * 🛠️ **管理员快捷指令**：允许管理员为指定平台用户增加或扣除余额，并覆盖结账金额后立即结账。
@@ -56,6 +56,8 @@ pricingConfigIds: [pricing-mahjong-a]
 * `login` / `入场` - 开启当前玩家的计费场次。
 * `logout` - 结算当前玩家的计费场次。
 玩家在未产生任何费用时退场，机器人会简洁显示“本次未产生费用”和当前余额；存在收费或优惠明细时仍显示完整结算账单。
+结账成功回执中的余额为后端已经完成扣款后的余额；只有 `/billing` 预览会显示当前余额与预计结账后余额。
+方案内区间封顶直接计入对应计时费用；全局封顶按日期和时段逐条列出，不合并、不截断，并直接形成计费总价，不作为优惠。若旧后端未返回结构化封顶窗口，插件会用封顶历史恢复原价与计入金额，不会显示内部 adjustment 差额。只作用于整次结账的资产优惠直接列在计费总价下方，不显示额外标题或 emoji，也不会误归属到最后一个 session。
 结账成功后，机器人会向 `staffUserIds` 与 `logoutNotifyUserIds` 中的用户私聊同一份账单，账单会明确显示结账玩家身份。
 同一玩家在前一次退场结账尚未完成时重复发送 `/logout` 或 `/退场`，机器人会复用同一次结账请求与账单，避免重复扣款。
 账单和管理员代操作回执均使用“平台昵称（QQ：号码）”称呼玩家；平台暂时无法提供昵称时显示“未知昵称（QQ：号码）”，不会显示内部玩家 ID。
@@ -72,8 +74,8 @@ pricingConfigIds: [pricing-mahjong-a]
 * `coin <deviceId> [count]` - 请求向指定设备投币指定枚数。
 * `scan <deviceId> <subject>` - 请求向设备发送模拟刷卡。
 * `redeem <code>` - 兑换礼物码。
-* `mahjong <tableId>` / `上桌 [tableId]` - 加入指定麻将桌；`/上桌` 未提供桌号时会引导查看 `/麻将列表`。仅允许已通过 `login`/`入场` 开启默认入场会话的玩家使用。
-* `下桌` - 自动离开当前所在麻将桌。
+* `mahjong <tableId>` / `上桌 [tableId]` - 加入指定麻将桌；`/上桌` 未提供桌号时会引导查看 `/麻将列表`。仅允许已通过 `login`/`入场` 开启默认入场会话的玩家使用。支持在桌位未满但已开局时进行中途补位（即直接开始计费上桌）。
+* `下桌` - 自动离开当前所在麻将桌，下桌后会停止计费，并显示该麻将桌的剩余游玩人数。
 * `麻将列表` - 查看已配置机器的桌名、命令别名，以及空闲、等位或游玩中状态。
 * `api测速 [次数]` - 连续查询自己的钱包，显示 Bot 到 PRiSM API 的最小、平均与最大延迟（默认 3 次，最多 10 次）。
 

package/lib/index.js

@@ -415,8 +415,23 @@ class PrismKoishiService {
             return `你已经在 ${existing}，无需重复上桌。`;
         const state = this.mahjongTables.get(tableKey) ?? { waiting: [], activeSessions: {} };
         this.mahjongTables.set(tableKey, state);
-        if (Object.keys(state.activeSessions).length > 0) {
-            return `「${tableSubject}」正在游玩中（${Object.keys(state.activeSessions).length}/${this.config.mahjongTableSize ?? 4}），请等待本局结束后再上桌。`;
+        const activeCount = Object.keys(state.activeSessions).length;
+        const tableSize = this.config.mahjongTableSize ?? 4;
+        if (activeCount >= tableSize) {
+            return `「${tableSubject}」正在游玩中（${activeCount}/${tableSize}），请等待本局结束后再上桌。`;
+        }
+        if (activeCount > 0) {
+            const label = tableConfig.displayName || `${this.config.mahjongLabelPrefix ?? "麻将桌"} ${tableKey}`;
+            const result = (await this.client.startSessionByIdentity(this.identity(sender), {
+                pricingConfigIds: tableConfig.pricingConfigIds,
+                label,
+            }));
+            const session = (result?.session ?? {});
+            const sessionId = String(session.id ?? "");
+            if (sessionId) {
+                state.activeSessions[playerId] = sessionId;
+            }
+            return `已加入 ${tableSubject}，补位成功，麻将计费已开始。当前 ${activeCount + 1}/${tableSize} 人。`;
         }
         state.waiting.push({
             playerId,
@@ -424,7 +439,6 @@ class PrismKoishiService {
             displayName: sender.name || playerId,
             identity: this.identity(sender),
         });
-        const tableSize = this.config.mahjongTableSize ?? 4;
         if (state.waiting.length < tableSize) {
             return `已加入 ${tableSubject}，当前 ${state.waiting.length}/${tableSize} 人。`;
         }
@@ -465,8 +479,10 @@ class PrismKoishiService {
         if (!sessionId)
             return "你当前未在任何麻将桌上。";
         delete state.activeSessions[playerId];
+        const remainingCount = Object.keys(state.activeSessions).length;
+        const tableSize = this.config.mahjongTableSize ?? 4;
         await this.client.stopSessionByIdentity(this.identity(sender), sessionId);
-        return `已离开 ${tableSubject}，麻将计费已停止。`;
+        return `已离开 ${tableSubject}，麻将计费已停止。当前还剩 ${remainingCount}/${tableSize} 人。`;
     }
     async listMahjongTables() {
         const activeResult = (await this.client.listActiveSessions());
@@ -510,22 +526,33 @@ class PrismKoishiService {
         const result = (await this.client.confirmCheckoutByIdentity(this.identity(sender), false));
         const settlement = result?.playerSettlement ?? result?.settlement ?? {};
         const records = result?.settlements ?? [];
+        const checkoutAdjustments = (result?.checkoutAdjustments ?? []);
+        const pricingCapAdjustments = (result?.pricingCapAdjustments ?? []);
+        const checkoutAdjustmentKeys = new Set(checkoutAdjustments.map(adjustmentKey));
+        const pricingCapAdjustmentKeys = new Set(pricingCapAdjustments.map(adjustmentKey));
         const sessionPreviews = records.map((rec) => {
             const s = rec?.settlement ?? {};
+            const sessionAdjustments = (rec?.adjustments ?? []).filter((adjustment) => {
+                const key = adjustmentKey(adjustment);
+                return !checkoutAdjustmentKeys.has(key) &&
+                    !pricingCapAdjustmentKeys.has(key) &&
+                    !isPricingCapAdjustment(adjustment);
+            });
+            const sessionSubtotal = toNumber(s.subtotal ?? 0);
             return {
                 sessionId: s.sessionId,
                 label: s.label,
                 startedAt: s.startedAt,
                 endedAt: s.endedAt ?? s.settledAt,
                 status: "closed",
-                subtotal: s.subtotal ?? 0,
-                total: s.total ?? 0,
+                subtotal: sessionSubtotal,
+                total: Math.max(0, sessionSubtotal + sessionAdjustments.reduce((sum, adjustment) => sum + toNumber(adjustment?.amount ?? 0), 0)),
                 chargeItems: rec?.chargeItems ?? [],
-                adjustments: rec?.adjustments ?? [],
+                adjustments: sessionAdjustments,
             };
         });
         const synthetic = {
-            settlementPreview: {
+            settlement: {
                 playerId: settlement.playerId,
                 subtotal: settlement.subtotal ?? 0,
                 total: settlement.total ?? 0,
@@ -533,6 +560,9 @@ class PrismKoishiService {
             sessionPreviews,
             chargeItems: result?.chargeItems ?? [],
             adjustments: result?.adjustments ?? [],
+            checkoutAdjustments,
+            pricingCapAdjustments,
+            globalCapWindows: result?.globalCapWindows ?? [],
             assetHoldings: result?.assetHoldings ?? [],
         };
         const receipt = await this.formatCheckoutPreview(synthetic, sender, "✅ 退场成功 · 结算账单");
@@ -892,7 +922,10 @@ class PrismKoishiService {
                 },
             ];
         }
-        const adjustments = result?.adjustments ?? [];
+        const adjustments = (result?.adjustments ?? []);
+        const pricingCapAdjustments = (result?.pricingCapAdjustments ?? adjustments.filter(isPricingCapAdjustment));
+        const sessionAdjustmentKeys = new Set(sessionPreviews.flatMap((session) => (session?.adjustments ?? []).map(adjustmentKey)));
+        const checkoutAdjustments = (result?.checkoutAdjustments ?? adjustments.filter((adjustment) => !isPricingCapAdjustment(adjustment) && !sessionAdjustmentKeys.has(adjustmentKey(adjustment))));
         const assetHoldings = result?.assetHoldings ?? [];
         const lines = [];
         lines.push(title);
@@ -907,7 +940,7 @@ class PrismKoishiService {
             }
         }
         const hasNonZeroSessionTotal = sessionPreviews.some((session) => toNumber(session?.total ?? 0) !== 0);
-        const hasNonZeroAdjustment = hasAdjustmentEntries(adjustments, sessionPreviews);
+        const hasNonZeroAdjustment = hasAdjustmentEntries(checkoutAdjustments, sessionPreviews);
         if (!hasNonZeroSessionTotal && !hasNonZeroAdjustment) {
             lines.push("");
             lines.push("本次未产生费用");
@@ -947,10 +980,58 @@ class PrismKoishiService {
                 lines.push(`  └ ${adjLabel}：${formatNumber(amount)}${currency}`);
             }
         }
+        const cappedWindows = (result?.globalCapWindows ?? []).filter((window) => toNumber(window?.currentAmount) !== toNumber(window?.amountApplied));
+        const appliedCapAdjustments = pricingCapAdjustments.filter((adjustment) => toNumber(adjustment?.amount ?? 0) !== 0);
+        if (cappedWindows.length > 0 || appliedCapAdjustments.length > 0) {
+            lines.push("");
+            lines.push("封顶：");
+            if (cappedWindows.length > 0) {
+                for (const window of cappedWindows) {
+                    const label = firstDefined(window, "ruleLabel", "label", "name") ?? "封顶时段";
+                    const startedAt = parseDateTime(window?.windowStartedAt);
+                    const datedLabel = startedAt ? `${formatMD(startedAt)} ${label}` : label;
+                    const currentAmount = toNumber(window?.currentAmount);
+                    const amountApplied = toNumber(window?.amountApplied);
+                    const priceCap = toNumber(window?.priceCap);
+                    const paidBefore = toNumber(window?.paidBefore);
+                    const details = [`上限${formatNumber(priceCap)}`];
+                    if (paidBefore > 0)
+                        details.push(`已计${formatNumber(paidBefore)}`);
+                    lines.push(`- ${datedLabel}：${formatNumber(currentAmount)} → ${formatNumber(amountApplied)}${currency}（${details.join("，")}）`);
+                }
+            }
+            else {
+                for (const adjustment of appliedCapAdjustments) {
+                    const label = firstDefined(adjustment, "label", "name", "source") ?? "封顶时段";
+                    const history = adjustment?.pricingCapHistory ?? {};
+                    const amountApplied = toNumber(history?.amount);
+                    const currentAmount = amountApplied - toNumber(adjustment?.amount ?? 0);
+                    const anchorAt = parseDateTime(history?.capAnchorAt);
+                    const datedLabel = anchorAt ? `${formatMD(anchorAt)} ${label}` : label;
+                    lines.push(amountApplied > 0
+                        ? `- ${datedLabel}：${formatNumber(currentAmount)} → ${formatNumber(amountApplied)}${currency}`
+                        : `- ${datedLabel}：${formatNumber(adjustment?.amount ?? 0)}${currency}`);
+                }
+            }
+        }
+        const visibleCheckoutAdjustments = checkoutAdjustments.filter((adjustment) => toNumber(firstDefined(adjustment ?? {}, "amount", "saved", 0)) !== 0);
         lines.push("");
-        lines.push(`计费总价：${formatNumber(subtotal)}${currency}`);
-        if (hasNonZeroAdjustment)
-            lines.push(`优惠后价格：${formatNumber(total)}${currency}`);
+        const cappedTotal = Math.max(0, toNumber(subtotal) + pricingCapAdjustments.reduce((sum, adjustment) => sum + toNumber(adjustment?.amount ?? 0), 0));
+        lines.push(`计费总价：${formatNumber(cappedTotal)}${currency}`);
+        const hasManualAdjustment = visibleCheckoutAdjustments.some((adjustment) => cleanText(adjustment?.source).startsWith("staff.override:"));
+        if (visibleCheckoutAdjustments.length > 0) {
+            lines.push("");
+            for (const adjustment of visibleCheckoutAdjustments) {
+                const amount = toNumber(firstDefined(adjustment ?? {}, "amount", "saved", 0));
+                const label = firstDefined(adjustment ?? {}, "label", "name", "source") ?? "优惠";
+                lines.push(`${label}：${formatNumber(amount)}${currency}`);
+            }
+        }
+        if (hasNonZeroAdjustment) {
+            if (visibleCheckoutAdjustments.length > 0)
+                lines.push("");
+            lines.push(`${hasManualAdjustment ? "调整后价格" : "优惠后价格"}：${formatNumber(total)}${currency}`);
+        }
         if (hasBalance) {
             const isPreview = result?.settlementPreview != null && result?.settlement == null;
             if (isPreview) {
@@ -1137,6 +1218,21 @@ function formatPlayerReference(sender, provider = "qq") {
     const name = sender.name && sender.name !== sender.id ? sender.name : "未知昵称";
     return `${name}（${provider.toUpperCase()}：${sender.id}）`;
 }
+function adjustmentKey(adjustment) {
+    const id = cleanText(adjustment?.id);
+    if (id)
+        return `id:${id}`;
+    return JSON.stringify([
+        adjustment?.source ?? "",
+        adjustment?.label ?? "",
+        toNumber(adjustment?.amount ?? 0),
+    ]);
+}
+function isPricingCapAdjustment(adjustment) {
+    return adjustment?.pricingCapHistory != null ||
+        cleanText(adjustment?.source).startsWith("time.cap:") ||
+        cleanText(adjustment?.id).startsWith("time-cap:");
+}
 function toNumber(value) {
     if (value == null)
         return 0;
@@ -1197,6 +1293,10 @@ function formatHM(dt) {
     const pad = (n) => String(n).padStart(2, "0");
     return `${pad(dt.getHours())}:${pad(dt.getMinutes())}`;
 }
+function formatMD(dt) {
+    const pad = (n) => String(n).padStart(2, "0");
+    return `${pad(dt.getMonth() + 1)}-${pad(dt.getDate())}`;
+}
 function formatDateTime(value) {
     const dt = parseDateTime(value);
     if (!dt)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-prism",
-  "version": "0.1.23",
+  "version": "0.1.28",
   "description": "PRiSM Next 计费与设备管理系统的 Koishi 机器人集成插件",
   "main": "./lib/index.js",
   "exports": {