koishi-plugin-prism 0.1.5 → 0.1.6

package/lib/index.js

@@ -712,6 +712,15 @@ class PrismKoishiService {
             return null;
         }
     }
+    async resolvePlayerDisplay(sender, playerId) {
+        if (!sender)
+            return playerId || "未知玩家";
+        const platformName = await this.resolvePlatformName(sender.id);
+        const name = platformName
+            || (sender.name && sender.name !== sender.id ? sender.name : playerId)
+            || sender.id;
+        return `玩家：${name}（${this.config.provider.toUpperCase()}：${sender.id}）`;
+    }
     mahjongTableForPlayer(playerId) {
         for (const [tableId, state] of this.mahjongTables) {
             if (state.activeSessions[playerId])
@@ -755,7 +764,7 @@ class PrismKoishiService {
             return "权限不足";
         return null;
     }
-    formatCheckoutPreview(result, sender, title = "【结算账单】") {
+    async formatCheckoutPreview(result, sender, title = "【结算账单】") {
         if (result?.billing && result?.session) {
             return formatLegacyBilling(result, this.config.currencyName);
         }
@@ -785,57 +794,57 @@ class PrismKoishiService {
         const adjustments = result?.adjustments ?? [];
         const assetHoldings = result?.assetHoldings ?? [];
         const lines = [];
-        const headerParts = [title];
-        if (playerId) {
-            const identitySuffix = sender ? `（${this.config.provider.toUpperCase()}：${sender.id}）` : "";
-            headerParts.push(`玩家ID：${playerId}${identitySuffix}`);
-        }
-        else if (sender) {
-            headerParts.push(`玩家：${sender.name || sender.id}（${this.config.provider.toUpperCase()}：${sender.id}）`);
-        }
-        lines.push(headerParts.join("\n"));
+        lines.push(title);
+        lines.push(await this.resolvePlayerDisplay(sender, playerId));
         const validStarts = sessionPreviews.map((s) => parseDateTime(s?.startedAt)).filter(Boolean);
         const validEnds = sessionPreviews.map((s) => sessionDisplayEnd(s, previewedAt)).filter(Boolean);
         if (validStarts.length > 0) {
             const overallStart = minDate(validStarts);
             const overallEnd = validEnds.length > 0 ? maxDate(validEnds) : now(this.config);
-            lines.push(`⏰全场到店时段：${formatHM(overallStart)}–${formatHM(overallEnd)}`);
+            lines.push(`⏰ 游玩时间：${formatHM(overallStart)}–${formatHM(overallEnd)}`);
         }
-        lines.push("");
         for (const sPrev of sessionPreviews) {
             const label = sPrev?.label || "计时区间";
             const startDt = parseDateTime(sPrev?.startedAt);
             const endDt = sessionDisplayEnd(sPrev, previewedAt);
             const status = sPrev?.status ?? "active";
             const sTotal = toNumber(sPrev?.total ?? 0);
+            lines.push("");
             lines.push(label);
             if (startDt && endDt) {
+                const minutes = Math.floor((endDt.getTime() - startDt.getTime()) / 60_000);
                 lines.push(`游玩时段：${formatHM(startDt)}-${formatHM(endDt)}`);
-                lines.push(`游玩时长：${formatDurationValue(Math.floor((endDt.getTime() - startDt.getTime()) / 60_000))}　｜　消费：${formatNumber(sTotal)}${currency}`);
+                lines.push(`游玩时长：${formatDurationValue(minutes)}｜消费：${formatNumber(sTotal)}${currency}`);
             }
             else if (startDt) {
                 lines.push(`入场：${formatHM(startDt)}  （${status === "active" ? "计费中" : "已关闭"}）`);
             }
-            lines.push("");
+            const sessionAdjustments = (sPrev?.adjustments ?? []);
+            for (const adj of sessionAdjustments) {
+                const amount = toNumber(firstDefined(adj ?? {}, "amount", "saved", 0));
+                if (amount === 0)
+                    continue;
+                const adjLabel = firstDefined(adj ?? {}, "label", "name", "source") ?? "优惠";
+                lines.push(`  └ ${adjLabel}：${formatNumber(amount)}${currency}`);
+            }
         }
-        lines.push("————————————");
-        const balanceParts = [];
+        let balance = 0;
+        let hasBalance = false;
         for (const holding of assetHoldings) {
-            const qty = toNumber(holding?.quantity ?? 0);
             const code = String(holding?.assetCode ?? "").toLowerCase();
             if (code.includes("paid") || code.includes("free") || code.includes("currency")) {
-                balanceParts.push(`${formatNumber(qty)}${currency}`);
+                balance += toNumber(holding?.quantity ?? 0);
+                hasBalance = true;
             }
         }
-        if (balanceParts.length > 0)
-            lines.push(`扣款后余额：${balanceParts.join("＋")}`);
+        lines.push("");
         lines.push(`计费总价：${formatNumber(subtotal)}${currency}`);
-        const hasDiscount = adjustments.some((adj) => {
-            const amount = toNumber(firstDefined(adj ?? {}, "amount", "saved", 0));
-            return amount !== 0;
-        });
+        const hasDiscount = adjustments.some((adj) => toNumber(firstDefined(adj ?? {}, "amount", "saved", 0)) !== 0)
+            || sessionPreviews.some((sp) => (sp?.adjustments ?? []).some((adj) => toNumber(firstDefined(adj ?? {}, "amount", "saved", 0)) !== 0));
         if (hasDiscount)
             lines.push(`优惠后价格：${formatNumber(total)}${currency}`);
+        if (hasBalance)
+            lines.push(`扣款后余额：${formatNumber(balance)}${currency}`);
         return lines.join("\n");
     }
     handleCommandError(error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-prism",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "PRiSM Next 计费与设备管理系统的 Koishi 机器人集成插件",
   "main": "./lib/index.js",
   "exports": {
@@ -48,4 +48,4 @@
     "test": "bun test test",
     "typecheck": "tsc -p tsconfig.json"
   }
-}
+}