koishi-plugin-prism 0.1.23 → 0.1.27

package/README.md

@@ -56,6 +56,8 @@ pricingConfigIds: [pricing-mahjong-a]
 * `login` / `入场` - 开启当前玩家的计费场次。
 * `logout` - 结算当前玩家的计费场次。
 玩家在未产生任何费用时退场，机器人会简洁显示“本次未产生费用”和当前余额；存在收费或优惠明细时仍显示完整结算账单。
+结账成功回执中的余额为后端已经完成扣款后的余额；只有 `/billing` 预览会显示当前余额与预计结账后余额。
+方案内区间封顶直接计入对应计时费用；全局封顶按日期和时段逐条列出，不合并、不截断，并直接形成计费总价，不作为优惠。只作用于整次结账的资产优惠直接列在计费总价下方，不显示额外标题或 emoji，也不会误归属到最后一个 session。
 结账成功后，机器人会向 `staffUserIds` 与 `logoutNotifyUserIds` 中的用户私聊同一份账单，账单会明确显示结账玩家身份。
 同一玩家在前一次退场结账尚未完成时重复发送 `/logout` 或 `/退场`，机器人会复用同一次结账请求与账单，避免重复扣款。
 账单和管理员代操作回执均使用“平台昵称（QQ：号码）”称呼玩家；平台暂时无法提供昵称时显示“未知昵称（QQ：号码）”，不会显示内部玩家 ID。

package/lib/index.js

@@ -510,22 +510,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 +544,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 +906,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 +924,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 +964,51 @@ 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") ?? "封顶时段";
+                    lines.push(`- ${label}：计费调整 ${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 +1195,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 +1270,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.27",
   "description": "PRiSM Next 计费与设备管理系统的 Koishi 机器人集成插件",
   "main": "./lib/index.js",
   "exports": {