koishi-plugin-prism 0.1.30 → 0.1.32

package/lib/index.js

@@ -388,7 +388,7 @@ class PrismKoishiService {
             const total = Number(rawAmount);
             if (!Number.isFinite(total) || total < 0)
                 return "金额必须为非负数";
-            const reason = cleanText(rawReason) || "Koishi 管理员手动调价";
+            const reason = cleanText(rawReason) || "管理员调价";
             const result = (await this.client.checkoutWithOverrideByIdentity(this.identity(sender), total, reason));
             const playerId = String(result?.playerSettlement?.playerId ?? result?.settlement?.playerId ?? "");
             if (playerId)
@@ -641,11 +641,14 @@ class PrismKoishiService {
         const { value, error } = parsePositiveInt(rawCount, "prism_coin", "数量", 1);
         if (error)
             return error;
-        await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
+        const result = await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
             type: "coin",
             target: { kind: "game_machine", id: deviceId },
             payload: { count: value },
         });
+        const failure = this.getCommandFailureMessage(result);
+        if (failure)
+            return `❌ 执行失败：${failure}`;
         return `🪙 已为 ${deviceId} 投入 ${value} 个币`;
     }
     async scan(sender, rawDeviceId, rawSubject) {
@@ -653,11 +656,14 @@ class PrismKoishiService {
         const subject = cleanText(rawSubject);
         if (!deviceId || !subject)
             return commandUsage("prism_scan");
-        await this.client.requestScanByIdentity(this.identity(sender), {
+        const result = await this.client.requestScanByIdentity(this.identity(sender), {
             deviceId,
             provider: this.config.defaultScanProvider || "aime",
             subject,
         });
+        const failure = this.getCommandFailureMessage(result);
+        if (failure)
+            return `❌ 执行失败：${failure}`;
         return `💳 使用尾号为 ${subject.slice(-4)} 的卡刷卡成功`;
     }
     async redeem(sender, rawCode) {
@@ -718,17 +724,27 @@ class PrismKoishiService {
     }
     /* ---------------------------- helpers ---------------------------------- */
     async power(sender, deviceId, state) {
-        await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
+        const result = await this.client.requestDeviceCommandByIdentity(this.identity(sender), {
             type: state === "on" ? "power.on" : "power.off",
             target: { kind: "facility", id: deviceId },
             payload: { state },
         });
+        const failure = this.getCommandFailureMessage(result);
+        if (failure)
+            return `❌ 执行失败：${failure}`;
         if (state === "on")
             return `✅ ${deviceId} 启动成功`;
         if (deviceId === "all")
             return `🛑 全部机器关闭成功`;
         return `🛑 ${deviceId} 关闭成功`;
     }
+    getCommandFailureMessage(result) {
+        const action = result?.action;
+        if (action?.status === "expired" || action?.status === "rejected") {
+            return action.payload?.executorFailure?.message || "命令执行被拒绝或超时";
+        }
+        return null;
+    }
     async resolvePlatformName(subject) {
         if (!this.config.resolveDisplayName)
             return null;
@@ -1035,11 +1051,15 @@ class PrismKoishiService {
                 }
             }
         }
-        const visibleCheckoutAdjustments = checkoutAdjustments.filter((adjustment) => toNumber(firstDefined(adjustment ?? {}, "amount", "saved", 0)) !== 0);
+        const visibleCheckoutAdjustments = checkoutAdjustments.filter((adjustment) => {
+            const amount = toNumber(firstDefined(adjustment ?? {}, "amount", "saved", 0));
+            const isOverride = cleanText(adjustment?.source).startsWith("staff.override:");
+            return amount !== 0 && !isOverride;
+        });
         lines.push("");
         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:"));
+        const hasManualAdjustment = checkoutAdjustments.some((adjustment) => cleanText(adjustment?.source).startsWith("staff.override:"));
         if (visibleCheckoutAdjustments.length > 0) {
             lines.push("");
             for (const adjustment of visibleCheckoutAdjustments) {

package/package.json

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