koishi-plugin-prism 0.1.19 → 0.1.22

package/README.md

@@ -57,7 +57,9 @@ pricingConfigIds: [pricing-mahjong-a]
 * `logout` - 结算当前玩家的计费场次。
 玩家在未产生任何费用时退场，机器人会简洁显示“本次未产生费用”和当前余额；存在收费或优惠明细时仍显示完整结算账单。
 结账成功后，机器人会向 `staffUserIds` 与 `logoutNotifyUserIds` 中的用户私聊同一份账单，账单会明确显示结账玩家身份。
+同一玩家在前一次退场结账尚未完成时重复发送 `/logout` 或 `/退场`，机器人会复用同一次结账请求与账单，避免重复扣款。
 账单和管理员代操作回执均使用“平台昵称（QQ：号码）”称呼玩家；平台暂时无法提供昵称时显示“未知昵称（QQ：号码）”，不会显示内部玩家 ID。
+管理员 `/add` 增加免费余额；`/del` 按结账相同的顺序从可用免费余额、再从付费余额扣除，余额不足时会返回余额不足提示。
 * `billing` - 预览当前玩家本场计费的消费费用。
 * `wallet` - 查看当前玩家的钱包余额。
 * `items` - 查看当前玩家持有的道具或资产。

package/lib/index.js

@@ -217,10 +217,10 @@ class PrismApiClient {
             body: this.identityBody(identity),
         });
     }
-    async confirmCheckoutByIdentity(identity) {
+    async confirmCheckoutByIdentity(identity, closeSessionsBeforeBalanceCheck = true) {
         return this.request("POST", "/rpc/integration/players/by-identity/checkout/confirm", {
             token: this.config.integrationToken,
-            body: this.identityBody(identity),
+            body: { ...this.identityBody(identity), closeSessionsBeforeBalanceCheck },
         });
     }
     async redeemCodeByIdentity(identity, code) {
@@ -280,6 +280,12 @@ class PrismApiClient {
             body: { ...this.identityBody(identity), adjustments },
         });
     }
+    async adjustWalletByIdentity(identity, amount, reason) {
+        return this.request("POST", "/rpc/integration/players/by-identity/wallet/adjustment", {
+            token: this.config.integrationToken,
+            body: { ...this.identityBody(identity), amount, reason },
+        });
+    }
     async checkoutWithOverrideByIdentity(identity, total, reason) {
         return this.request("POST", "/rpc/integration/players/by-identity/checkout/override", {
             token: this.config.integrationToken,
@@ -291,6 +297,7 @@ class PrismApiClient {
 class PrismKoishiService {
     config;
     mahjongTables = new Map();
+    logoutInFlight = new Map();
     client;
     constructor(ctx, config) {
         this.config = config;
@@ -370,12 +377,7 @@ class PrismKoishiService {
             if (!Number.isFinite(amount) || amount <= 0)
                 return "金额必须大于 0";
             const isAddition = direction === 1;
-            await this.client.adjustAssetsByIdentity(this.identity(sender), [{
-                    assetType: "currency",
-                    assetCode: "paid",
-                    quantityDelta: amount * direction,
-                    reason: isAddition ? "Koishi 管理员增加余额" : "Koishi 管理员扣除余额",
-                }]);
+            await this.client.adjustWalletByIdentity(this.identity(sender), amount * direction, isAddition ? "Koishi 管理员增加余额" : "Koishi 管理员扣除余额");
             return `✅ 已为用户 ${formatPlayerReference(sender, this.config.provider)}${isAddition ? "增加" : "扣除"} ${formatNumber(amount)} ${this.config.currencyName}`;
         }, bot);
     }
@@ -489,7 +491,21 @@ class PrismKoishiService {
         return this.formatCheckoutPreview(result, sender);
     }
     async logout(sender, bot) {
-        const result = (await this.client.confirmCheckoutByIdentity(this.identity(sender)));
+        const existing = this.logoutInFlight.get(sender.id);
+        if (existing)
+            return existing;
+        const task = this.performLogout(sender, bot);
+        this.logoutInFlight.set(sender.id, task);
+        try {
+            return await task;
+        }
+        finally {
+            if (this.logoutInFlight.get(sender.id) === task)
+                this.logoutInFlight.delete(sender.id);
+        }
+    }
+    async performLogout(sender, bot) {
+        const result = (await this.client.confirmCheckoutByIdentity(this.identity(sender), false));
         const settlement = result?.playerSettlement ?? result?.settlement ?? {};
         const records = result?.settlements ?? [];
         const sessionPreviews = records.map((rec) => {
@@ -913,8 +929,19 @@ class PrismKoishiService {
         lines.push(`计费总价：${formatNumber(subtotal)}${currency}`);
         if (hasNonZeroAdjustment)
             lines.push(`优惠后价格：${formatNumber(total)}${currency}`);
-        if (hasBalance)
-            lines.push(`扣款后余额：${formatNumber(balance)}${currency}`);
+        if (hasBalance) {
+            const isPreview = result?.settlementPreview != null && result?.settlement == null;
+            if (isPreview) {
+                const projectedBalance = balance - toNumber(total);
+                lines.push(`当前余额：${formatNumber(balance)}${currency}`);
+                lines.push(projectedBalance >= 0
+                    ? `预计结账后余额：${formatNumber(projectedBalance)}${currency}`
+                    : `预计结账后余额：余额不足（还差 ${formatNumber(-projectedBalance)}${currency}）`);
+            }
+            else {
+                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.19",
+  "version": "0.1.22",
   "description": "PRiSM Next 计费与设备管理系统的 Koishi 机器人集成插件",
   "main": "./lib/index.js",
   "exports": {