koishi-plugin-monetary-bourse 2.0.3-Alpha.11 → 2.1.0

package/lib/index.js

@@ -138,7 +138,7 @@ function apply(ctx, config) {
   }
   __name(isMarketOpen, "isMarketOpen");
   async function getCashBalance(uid, currency) {
-    if (!uid || typeof uid !== "number" || Number.isNaN(uid)) {
+    if (uid === void 0 || uid === null || typeof uid !== "number" || Number.isNaN(uid)) {
       logger.warn(`getCashBalance: 无效的uid: ${uid}`);
       return 0;
     }
@@ -157,7 +157,7 @@ function apply(ctx, config) {
   }
   __name(getCashBalance, "getCashBalance");
   async function changeCashBalance(uid, currency, delta) {
-    if (!uid || typeof uid !== "number" || Number.isNaN(uid)) {
+    if (uid === void 0 || uid === null || typeof uid !== "number" || Number.isNaN(uid)) {
       logger.warn(`changeCashBalance: 无效的uid: ${uid}`);
       return false;
     }
@@ -190,7 +190,7 @@ function apply(ctx, config) {
   }
   __name(changeCashBalance, "changeCashBalance");
   async function getBankDemandBalance(uid, currency) {
-    if (!uid || typeof uid !== "number" || Number.isNaN(uid)) return 0;
+    if (uid === void 0 || uid === null || typeof uid !== "number" || Number.isNaN(uid)) return 0;
     try {
       const tables = ctx.database.tables;
       if (!tables || !("monetary_bank_int" in tables)) {
@@ -211,7 +211,7 @@ function apply(ctx, config) {
   }
   __name(getBankDemandBalance, "getBankDemandBalance");
   async function deductBankDemand(uid, currency, amount) {
-    if (!uid || typeof uid !== "number" || Number.isNaN(uid) || amount <= 0) return false;
+    if (uid === void 0 || uid === null || typeof uid !== "number" || Number.isNaN(uid) || amount <= 0) return false;
     try {
       const tables = ctx.database.tables;
       if (!tables || !("monetary_bank_int" in tables)) return false;
@@ -727,7 +727,7 @@ function apply(ctx, config) {
           });
         }
       } else if (txn.type === "sell") {
-        if (txn.uid && typeof txn.uid === "number") {
+        if (txn.uid !== void 0 && txn.uid !== null && typeof txn.uid === "number" && !Number.isNaN(txn.uid)) {
           const amount = Number(txn.cost.toFixed(2));
           const success = await changeCashBalance(txn.uid, config.currency, amount);
           if (!success) {
@@ -755,7 +755,7 @@ function apply(ctx, config) {
     }));
   }
   __name(getPriceHistory, "getPriceHistory");
-  ctx.command("stock [interval:string]", "查看股市行情").action(async ({ session }, interval) => {
+  ctx.command("stock [interval:string]", "查看股市行情").userFields(["id"]).action(async ({ session }, interval) => {
     if (["buy", "sell", "my"].includes(interval)) {
       const parts = session.content.trim().split(/\s+/).slice(2);
       const rest = parts.join(" ");
@@ -815,15 +815,15 @@ function apply(ctx, config) {
       return "请输入有效的购买股数（整数）。";
     }
     if (!await isMarketOpen()) return "休市中，无法交易。";
-    let uid = session.user?.id;
     const visibleUserId = session.userId;
-    if (!uid || typeof uid !== "number") {
-      const parsedUid = Number(uid);
-      if (isNaN(parsedUid)) {
-        logger.error(`stock.buy: 无法获取数字UID user=${session.userId}`);
-        return "无法获取用户ID，请稍后重试。";
-      }
-      uid = parsedUid;
+    if (!session.user || session.user.id === void 0 || session.user.id === null) {
+      logger.error(`stock.buy: session.user 不存在或 id 为空 user=${session.userId}`);
+      return "无法获取用户ID，请稍后重试。";
+    }
+    const uid = session.user.id;
+    if (typeof uid !== "number") {
+      logger.error(`stock.buy: 无法获取数字UID user=${session.userId}, rawId=${uid}`);
+      return "无法获取用户ID，请稍后重试。";
     }
     const cost = Number((currentPrice * amount).toFixed(2));
     const payResult = await pay(uid, cost, config.currency);
@@ -838,7 +838,7 @@ function apply(ctx, config) {
       if (freezeMinutes < config.minFreezeTime) freezeMinutes = config.minFreezeTime;
     }
     const freezeMs = freezeMinutes * 60 * 1e3;
-    const userPendingOrders = await ctx.database.get("bourse_pending", { userId: visibleUserId }, { sort: { endTime: "desc" }, limit: 1 });
+    const userPendingOrders = await ctx.database.get("bourse_pending", { userId: visibleUserId, type: "buy" }, { sort: { endTime: "desc" }, limit: 1 });
     let startTime = /* @__PURE__ */ new Date();
     if (userPendingOrders.length > 0) {
       const lastOrderEndTime = userPendingOrders[0].endTime;
@@ -901,15 +901,15 @@ function apply(ctx, config) {
       return "请输入有效的卖出股数。";
     }
     if (!await isMarketOpen()) return "休市中，无法交易。";
-    let uid = session.user?.id;
     const visibleUserId = session.userId;
-    if (!uid || typeof uid !== "number") {
-      const parsedUid = Number(uid);
-      if (isNaN(parsedUid)) {
-        logger.error(`stock.sell: 无法获取数字UID user=${session.userId}`);
-        return "无法获取用户ID，请稍后重试。";
-      }
-      uid = parsedUid;
+    if (!session.user || session.user.id === void 0 || session.user.id === null) {
+      logger.error(`stock.sell: session.user 不存在或 id 为空 user=${session.userId}`);
+      return "无法获取用户ID，请稍后重试。";
+    }
+    const uid = session.user.id;
+    if (typeof uid !== "number") {
+      logger.error(`stock.buy: 无法获取数字UID user=${session.userId}, rawId=${uid}`);
+      return "无法获取用户ID，请稍后重试。";
     }
     const holding = await ctx.database.get("bourse_holding", { userId: visibleUserId, stockId });
     if (holding.length === 0 || holding[0].amount < amount) {
@@ -944,7 +944,7 @@ function apply(ctx, config) {
       if (freezeMinutes < config.minFreezeTime) freezeMinutes = config.minFreezeTime;
     }
     const freezeMs = freezeMinutes * 60 * 1e3;
-    const userPendingOrders = await ctx.database.get("bourse_pending", { userId: visibleUserId }, { sort: { endTime: "desc" }, limit: 1 });
+    const userPendingOrders = await ctx.database.get("bourse_pending", { userId: visibleUserId, type: "sell" }, { sort: { endTime: "desc" }, limit: 1 });
     let startTime = /* @__PURE__ */ new Date();
     if (userPendingOrders.length > 0) {
       const lastOrderEndTime = userPendingOrders[0].endTime;
@@ -1010,7 +1010,11 @@ function apply(ctx, config) {
       tradeMeta
     );
   });
-  ctx.command("stock.my", "我的持仓").action(async ({ session }) => {
+  ctx.command("stock.my", "我的持仓").userFields(["id"]).action(async ({ session }) => {
+    if (!session.user || session.user.id === void 0 || session.user.id === null) {
+      logger.error(`stock.my: session.user 不存在或 id 为空 user=${session.userId}`);
+      return "无法获取用户ID，请稍后重试。";
+    }
     const userId = session.userId;
     const holdings = await ctx.database.get("bourse_holding", { userId });
     const pending = await ctx.database.get("bourse_pending", { userId });