koishi-plugin-ets2-tools-tmp 3.4.5 → 3.5.0

package/lib/command/ets-app/changePoint/changePointV1.js

@@ -1,9 +1,13 @@
+const qqOfficial = require('../../../util/qqOfficial');
 module.exports = async (ctx, cfg, session, target, changeType, quantity, reason) => {
     const { url, token, logOutput } = cfg.mainSettings?.settings || {};
     const { adminUsers } = cfg.changePoint?.settings || {};
     const currentUserQQ = session.userId;
     const isPrivateChat = session.channelId === `private:${currentUserQQ}`;
     const isAdmin = adminUsers.includes(currentUserQQ);
+    // QQ 官方机器人：只能拿到 unionid，没有 QQ 号
+    const official = qqOfficial.isQQOfficial(session);
+    const officialIdent = official ? qqOfficial.getQQIdentity(session) : null;
 
     const log = (msg) => logOutput && ctx.logger.info(msg);
 
@@ -43,16 +47,33 @@ module.exports = async (ctx, cfg, session, target, changeType, quantity, reason)
         let userId;
 
         if (target) {
-            const parsedQQ = parseAtQQ(target);
-            const isQQ = parsedQQ && /^\d+$/.test(parsedQQ);
-            const isTeamId = !isQQ && /^\d+$/.test(target);
+            // 只有真正的 <at ...> 才算 QQ 号来源；纯数字既可能是 QQ 也可能是车队编号，
+            // 旧代码用 parseAtQQ 的“原样返回”会把车队编号误判成 QQ，这里显式区分。
+            const isAtMention = String(target).startsWith("<at ");
+            const parsedQQ = isAtMention ? parseAtQQ(target) : null;
+            const atId = parsedQQ && /^\d+$/.test(parsedQQ) ? parsedQQ : null;
+            const isTeamId = !isAtMention && /^\d+$/.test(target);
 
             let queryUrl;
-            if (isQQ) {
-                queryUrl = `https://${baseUrl}/api/user/info/list?page=0&limit=7&tmpId=&tmpName=&teamId=&qq=${encodeURIComponent(parsedQQ)}&state=0&teamRole=&token=${token}`;
-                log(`[V1] 通过QQ号查询成员: ${parsedQQ}`);
+            if (official) {
+                // 官方机器人：@ 拿到的是 openid 不是 QQ 号，只能按车队编号
+                if (isAtMention) {
+                    return "QQ 官方机器人暂不支持通过 @ 指定成员，请改用车队编号（如「积分修改 789 增加 10 备注」）";
+                }
+                if (!officialIdent || !officialIdent.unionId) {
+                    return "未获取到 unionid，无法执行积分修改。请确认机器人已开通 unionid 权限";
+                }
+                if (isTeamId) {
+                    queryUrl = `https://${baseUrl}/api/user/info/list?token=${token}&page=1&limit=7&tmpId=&tmpName=&teamId=${encodeURIComponent(target)}&qq=&unionid=&state=0&teamRole=&isExecutive=&isManager=&adminUserId=`;
+                    log(`[V1] 通过车队编号查询成员: ${target}`);
+                } else {
+                    return "目标用户格式不正确，请输入车队编号";
+                }
+            } else if (isAtMention && atId) {
+                queryUrl = `https://${baseUrl}/api/user/info/list?token=${token}&page=1&limit=7&tmpId=&tmpName=&teamId=&qq=${encodeURIComponent(atId)}&unionid=&state=0&teamRole=&isExecutive=&isManager=&adminUserId=`;
+                log(`[V1] 通过QQ号查询成员: ${atId}`);
             } else if (isTeamId) {
-                queryUrl = `https://${baseUrl}/api/user/info/list?page=0&limit=7&tmpId=&tmpName=&teamId=${encodeURIComponent(target)}&qq=&state=0&teamRole=&token=${token}`;
+                queryUrl = `https://${baseUrl}/api/user/info/list?token=${token}&page=1&limit=7&tmpId=&tmpName=&teamId=${encodeURIComponent(target)}&qq=&unionid=&state=0&teamRole=&isExecutive=&isManager=&adminUserId=`;
                 log(`[V1] 通过车队编号查询成员: ${target}`);
             } else {
                 return "目标用户格式不正确，请输入车队编号或@群成员";

package/lib/command/ets-app/pointRanking/pointRanking.js

@@ -40,7 +40,7 @@ module.exports = async (ctx, cfg, session) => {
         let totalPage = 1;
 
         while (currentPage <= totalPage) {
-            const queryUrl = `https://${baseUrl}/api/user/info/list?page=${currentPage}&limit=100&tmpId=&tmpName=&teamId=&qq=&state=0&teamRole=&token=${token}`;
+            const queryUrl = `https://${baseUrl}/api/user/info/list?page=${currentPage}&limit=100&tmpId=&tmpName=&teamId=&qq=&unionid=&state=0&teamRole=&isExecutive=&isManager=&adminUserId=&token=${token}`;
             log(`[积分排行] 请求第 ${currentPage} 页: ${queryUrl.replace(token, "***")}`);
 
             const response = await ctx.http.get(queryUrl, { timeout: 10000 });
@@ -98,10 +98,17 @@ module.exports = async (ctx, cfg, session) => {
         log(`[积分排行] 排行榜前10名已生成, 第一名: ${top10[0]?.tmpName} (${top10[0]?.rewardPoints}积分)`);
 
         // 查询当前用户的排名
+        // onebot 用 QQ 号比对；QQ 官方机器人没有 QQ 号，改用 unionid 比对
         let currentPlayer = null;
+        const official = qqOfficial.isQQOfficial(session);
+        const officialUnionId = official ? (qqOfficial.getQQIdentity(session).unionId || '') : '';
         const currentUserQQ = String(session.userId || '');
-        if (currentUserQQ) {
-            const playerIndex = sortedMembers.findIndex(m => String(m.qq) === currentUserQQ);
+        const hasIdentity = official ? !!officialUnionId : !!currentUserQQ;
+
+        if (hasIdentity) {
+            const playerIndex = official
+                ? sortedMembers.findIndex(m => String(m.unionid || '') !== '' && String(m.unionid) === officialUnionId)
+                : sortedMembers.findIndex(m => String(m.qq) === currentUserQQ);
             if (playerIndex !== -1) {
                 const player = sortedMembers[playerIndex];
                 currentPlayer = {
@@ -114,7 +121,7 @@ module.exports = async (ctx, cfg, session) => {
                 };
                 log(`[积分排行] 找到当前用户: ${currentPlayer.tmpName}, 排名: ${currentPlayer.rank}, 积分: ${currentPlayer.rewardPoints}`);
             } else {
-                log(`[积分排行] 未在车队成员中找到当前用户QQ: ${currentUserQQ}`);
+                log(`[积分排行] 未找到当前用户（${official ? 'unionid=' + officialUnionId : 'QQ=' + currentUserQQ}）`);
             }
         }
 
@@ -138,7 +145,7 @@ module.exports = async (ctx, cfg, session) => {
             const element = await page.$("#container");
             return segment.image(await element.screenshot({
                 encoding: "binary"
-            }), "image/jpg");
+            }), "image/jpeg");
         }
         catch (e) {
             log(`[积分排行] 渲染异常: ${e.message}`);

package/lib/command/ets-app/queryPoint/queryPoint.js

@@ -1,7 +1,21 @@
 const queryPointV1 = require("./queryPointV1");
 const tmpIdPicker = require("../../../util/tmpIdPicker");
+const qqOfficial = require("../../../util/qqOfficial");
 
 module.exports = async (ctx, cfg, session, targetQQ) => {
+  // QQ 官方机器人只能拿到 unionid，没有 QQ 号
+  if (qqOfficial.isQQOfficial(session)) {
+    const ident = qqOfficial.getQQIdentity(session);
+    // 指定了目标（@某人 / QQ号）时官方机器人无法解析，明确提示而不是静默失败
+    if (targetQQ) {
+      return "QQ 官方机器人暂不支持查询他人积分，请让对方自己发送「查询积分」";
+    }
+    if (!ident.unionId) {
+      return "未获取到你的 unionid，无法查询积分。请确认机器人已开通 unionid 权限";
+    }
+    return await queryPointV1(ctx, cfg, { unionid: ident.unionId });
+  }
+
   let queryQQ = targetQQ;
   if (!queryQQ) {
     queryQQ = session.userId;
@@ -19,5 +33,5 @@ module.exports = async (ctx, cfg, session, targetQQ) => {
     }
   }
 
-  return await queryPointV1(ctx, cfg, queryQQ);
+  return await queryPointV1(ctx, cfg, { qq: queryQQ });
 };

package/lib/command/ets-app/queryPoint/queryPointV1.js

@@ -1,12 +1,26 @@
-module.exports = async (ctx, cfg, queryQQ) => {
+/**
+ * 查询积分。
+ * @param {object|string} identity 查询身份：
+ *        - { qq: '123456789' }        onebot（QQ 号）
+ *        - { unionid: 'UID_xxx' }     QQ 官方机器人（unionid）
+ *        - 传字符串时按 QQ 号处理（兼容旧调用）
+ */
+module.exports = async (ctx, cfg, identity) => {
   const { Name, url, token, logOutput } = cfg.mainSettings?.settings || {};
 
+  // 兼容旧签名（直接传 QQ 号）
+  const query = (identity && typeof identity === 'object') ? identity : { qq: identity };
+  const qq = query.qq ? String(query.qq) : '';
+  const unionid = query.unionid ? String(query.unionid) : '';
+  const isUnionQuery = !qq && !!unionid;
+  const whoText = isUnionQuery ? `unionid=${unionid}` : `QQ号 ${qq}`;
+
   try {
     if (logOutput) {
-      ctx.logger.info(`开始查询用户 ${queryQQ} 的积分`);
+      ctx.logger.info(`开始查询用户 ${whoText} 的积分`);
     }
 
-    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=&tmpName=&teamId=&qq=${queryQQ}&state=0&teamRole=`;
+    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=1&limit=7&tmpId=&tmpName=&teamId=&qq=${qq}&unionid=${unionid}&state=0&teamRole=&isExecutive=&isManager=&adminUserId=`;
     if (logOutput) {
       ctx.logger.info(`请求V1.0用户信息: ${userInfoUrl}`);
     }
@@ -20,7 +34,7 @@ module.exports = async (ctx, cfg, queryQQ) => {
     }
     const userList = userInfoResponse.page?.list || [];
     if (userList.length === 0) {
-      return `未找到QQ号 ${queryQQ} 关联的用户信息`;
+      return `未找到 ${whoText} 关联的用户信息`;
     }
 
     const userInfo = userList[0];
@@ -29,11 +43,13 @@ module.exports = async (ctx, cfg, queryQQ) => {
     const teamId = userInfo.teamId || userInfo.uid || "未知编号";
     const rewardPoints = userInfo.rewardPoints || userInfo.point || 0;
     const joinDate = userInfo.joinDate || "未知";
+    // 展示用 QQ：优先用接口返回的真实 QQ 号（官方机器人本地没有 QQ 号）
+    const displayQQ = userInfo.qq || qq || '未绑定';
 
     let message = `🚛 ${Name}平台 - 积分查询🚚\n`;
     message += `👤 用户: ${tmpName}\n`;
     message += `🆔 车队编号: ${teamId}\n`;
-    message += `📧 QQ: ${queryQQ}\n`;
+    message += `📧 QQ: ${displayQQ}\n`;
     message += `🏆 职位: ${teamRole}\n`;
     message += `⭐ 当前积分: ${rewardPoints}\n`;
     message += `📅 加入日期: ${joinDate}`;

package/lib/command/ets-app/resetPassword/resetPasswordV1.js

@@ -1,3 +1,4 @@
+const qqOfficial = require('../../../util/qqOfficial');
 module.exports = async (ctx, cfg, session, targetTeamId, password) => {
     const { url, token, logOutput } = cfg.mainSettings?.settings || {};
     const { adminUsers } = cfg.resetPassword?.settings || {};
@@ -7,6 +8,28 @@ module.exports = async (ctx, cfg, session, targetTeamId, password) => {
 
     const log = (msg) => logOutput && ctx.logger.info(msg);
 
+    // QQ 官方机器人：只能拿到 unionid，没有 QQ 号
+    const official = qqOfficial.isQQOfficial(session);
+    const officialUnionId = official ? (qqOfficial.getQQIdentity(session).unionId || '') : '';
+
+    /** 「查我自己」的查询参数：onebot 用 qq，官方机器人用 unionid */
+    const selfQuery = official
+        ? (officialUnionId ? { unionid: officialUnionId } : null)
+        : { qq: currentUserQQ };
+
+    /**
+     * 判断某条平台用户记录是否属于「当前会话用户」。
+     * onebot 比 qq，官方机器人比 unionid。
+     */
+    const isSelf = (userInfo) => {
+        if (!userInfo) return false;
+        if (official) {
+            if (!officialUnionId) return false;
+            return String(userInfo.unionid || '') === officialUnionId;
+        }
+        return String(userInfo.qq) === String(currentUserQQ);
+    };
+
     const parseAtQQ = (raw) => {
         if (!raw?.startsWith("<at ")) return raw;
         const idStart = raw.indexOf('id="');
@@ -55,6 +78,10 @@ module.exports = async (ctx, cfg, session, targetTeamId, password) => {
 
         if (targetTeamId?.startsWith("<at ")) {
             if (!isAdmin) return "您没有权限重置其他用户的密码，请联系管理员";
+            // 官方机器人 @ 拿到的是 openid，不是 QQ 号，无法用于查询
+            if (official) {
+                return "QQ 官方机器人暂不支持通过 @ 指定成员，请改用车队编号（如「重置密码 789」）";
+            }
 
             const idStart = targetTeamId.indexOf('id="');
             if (idStart === -1) return "获取QQ号错误，请使用车队编号重置";
@@ -69,14 +96,16 @@ module.exports = async (ctx, cfg, session, targetTeamId, password) => {
             if (isPrivateChat) {
                 if (!targetTeamId) {
                     log(`用户 ${currentUserQQ} 发起密码重置`);
-                    const userInfo = await getUserInfo({ qq: currentUserQQ });
+                    if (!selfQuery) return "未获取到你的 unionid，无法重置密码。请确认机器人已开通 unionid 权限";
+                    const userInfo = await getUserInfo(selfQuery);
                     teamId = userInfo.teamId;
                     if (!teamId) return "未找到您的信息，请联系管理员";
                 } else {
                     log(`用户 ${currentUserQQ} 尝试重置车队编号 ${targetTeamId} 的密码`);
                     const userInfo = await getUserInfo({ teamId: targetTeamId });
 
-                    if (!isAdmin && String(userInfo.qq) !== String(currentUserQQ)) {
+                    // 归属校验：官方机器人没有 QQ 号，改用 unionid 比对
+                    if (!isAdmin && !isSelf(userInfo)) {
                         return "您没有权限重置其他成员的密码，请联系管理员";
                     }
 
@@ -84,7 +113,7 @@ module.exports = async (ctx, cfg, session, targetTeamId, password) => {
                     if (isAdmin) {
                         log(`管理员 ${currentUserQQ} 重置车队编号 ${targetTeamId} 的密码`);
                     } else {
-                        log(`验证通过，车队编号 ${targetTeamId} 对应的QQ ${userInfo.qq} 与当前用户QQ ${currentUserQQ} 一致`);
+                        log(`验证通过，车队编号 ${targetTeamId} 的归属校验通过（${official ? 'unionid' : 'QQ'} 一致）`);
                     }
                 }
             } else {

package/lib/command/tmpBind.js

@@ -1,10 +1,22 @@
 const guildBind = require('../database/guildBind');
 const truckersMpApi = require("../api/truckersMpApi");
 const evmOpenApi = require('../api/evmOpenApi');
+const qqOfficial = require('../util/qqOfficial');
+const messageRender = require('../util/messageRender');
+
 /**
  * 绑定 TMP ID（支持绑定多个：追加入库，同一编号重复绑定会提示）
+ *
+ * 输出包装：QQ 官方机器人下把结果包成 qq:markdown 并附加按钮；
+ * onebot 原样返回字符串，行为与以前完全一致。
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
+    const text = await bindImpl(ctx, cfg, session, tmpId);
+    return await decorate(session, text);
+};
+
+/** 实际绑定逻辑 */
+async function bindImpl(ctx, cfg, session, tmpId) {
     if (!tmpId || isNaN(tmpId)) {
         return `请输入正确的玩家编号`;
     }
@@ -13,16 +25,41 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     if (playerInfo.error) {
         return '绑定失败 (查询玩家信息失败)';
     }
-    // 追加绑定（同一 tmpId 已绑定过则提示，不重复入库）
-    const result = await guildBind.add(ctx.database, session.platform, session.userId, playerInfo.data.tmpId, playerInfo.data.name);
+    // QQ 官方机器人下顺带记录 openid / union_id（onebot 下为 null，行为不变）
+    const identity = qqOfficial.buildIdentity(session);
+    const result = await guildBind.add(
+        ctx.database, session.platform, session.userId,
+        playerInfo.data.tmpId, playerInfo.data.name,
+        identity.isQQOfficial ? identity : null
+    );
     if (result.exists) {
         const hint = result.isDefault ? '（该编号已是你的默认绑定）' : '';
         return `该编号已在绑定列表中 ( ${playerInfo.data.name} )${hint}，无需重复绑定`;
     }
-    const count = (await guildBind.list(ctx.database, session.platform, session.userId)).length;
+    const count = (await guildBind.listWithUnion(
+        ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session)
+    )).length;
     if (count === 1) {
         return `绑定成功 ( ${playerInfo.data.name} )，当前已绑定 ${count} 个编号（已自动设为默认绑定）`;
     }
     const defaultTip = result.isDefault ? '（已设为默认绑定）' : '';
     return `绑定成功 ( ${playerInfo.data.name} )${defaultTip}，当前已绑定 ${count} 个编号`;
-};
+}
+
+/**
+ * 官方机器人下包装输出（markdown + 按钮）；其它平台原样返回。
+ * 失败提示（短文本）不附按钮。
+ */
+async function decorate(session, text) {
+    if (!qqOfficial.isQQOfficial(session)) return text;
+    if (typeof text !== 'string') return text;
+
+    const isError = /失败|错误|不正确|已在绑定列表/.test(text);
+    if (isError) {
+        return await messageRender.renderText(session, text, { markdown: true });
+    }
+    const buttons = [
+        [qqOfficial.inputButton('我的绑定', '我的绑定', true), qqOfficial.inputButton('查询', '查询')],
+    ];
+    return await messageRender.renderText(session, text, { buttons, markdown: true });
+}

package/lib/command/tmpDlcMap.js

@@ -19,7 +19,7 @@ module.exports = async (ctx, session) => {
         const element = await page.$("#dlc-info-container");
         return (segment.image(await element.screenshot({
             encoding: "binary"
-        }), "image/jpg"));
+        }), "image/jpeg"));
     }
     catch (e) {
         console.info(e);

package/lib/command/tmpFootprint.js

@@ -5,6 +5,7 @@ const common = require('../util/common')
 const { PromodsIds, AtsIds, AtsFootprintStartDate, ServerType } = require('../util/constant')
 const evmOpenApi = require('../api/evmOpenApi')
 const guildBind = require('../database/guildBind')
+const qqOfficial = require('../util/qqOfficial')
 const tmpIdPicker = require('../util/tmpIdPicker')
 
 // 足迹统计数据的开始收集日期（仅用于近一年足迹图片中的提示展示）
@@ -101,7 +102,7 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
   // 如果没有传入tmpId，尝试从绑定记录获取（多绑定时会列出序号供选择，支持多选=发多张足迹图）
   // 足迹不出图量大，禁用 all（避免一次请求打满服务器）
   if (!tmpId) {
-    const bindings = await guildBind.list(ctx.database, session.platform, session.userId)
+    const bindings = await guildBind.listWithUnion(ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session))
     if (bindings.length === 0) {
       return `请输入正确的玩家编号，或绑定玩家编号`
     }
@@ -256,7 +257,7 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
     return (
       segment.image(await element.screenshot({
         encoding: "binary"
-      }), "image/jpg")
+      }), "image/jpeg")
     )
   } catch (e) {
     return '渲染异常，请重试'

package/lib/command/tmpMileageRanking.js

@@ -4,8 +4,12 @@ const common = require('../util/common');
 const evmOpenApi = require('../api/evmOpenApi');
 const guildBind = require('../database/guildBind');
 const tmpIdPicker = require('../util/tmpIdPicker');
-module.exports = async (ctx, session, rankingType, target) => {
-    if (!ctx.puppeteer) {
+const messageRender = require('../util/messageRender');
+const qqOfficial = require('../util/qqOfficial');
+module.exports = async (ctx, cfg, session, rankingType, target) => {
+    // 仅在图片模式下才需要 puppeteer；文本模式不拦截
+    const wantImage = messageRender.wantImage(messageRender.readType(cfg, 'tmpMileageRanking.type'));
+    if (wantImage && !ctx.puppeteer) {
         return '未启用 Puppeteer 功能';
     }
     // 查询排行榜信息
@@ -49,26 +53,73 @@ module.exports = async (ctx, session, rankingType, target) => {
         mileageRankingList: mileageRankingList.data,
         playerMileageRanking: playerMileageRanking
     };
-    let page;
-    try {
-        page = await ctx.puppeteer.page();
-        await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 });
-        await page.goto(`file:///${resolve(__dirname, '../resource/mileage-leaderboard.html')}`);
-        await page.evaluate(`setData(${JSON.stringify(data)})`);
-        await page.waitForNetworkIdle();
-        await common.sleep(500);
-        const element = await page.$("#container");
-        return (segment.image(await element.screenshot({
-            encoding: "binary"
-        }), "image/jpg"));
-    }
-    catch (e) {
-        console.info(e);
-        return '渲染异常，请重试';
-    }
-    finally {
-        if (page) {
-            await page.close();
+
+    const buttons = buildRankingButtons(session, rankingType);
+    const text = buildRankingText(data);
+
+    return await messageRender.renderByType(ctx, session, cfg, 'tmpMileageRanking.type', {
+        text,
+        buttons,
+        caption: (Number(rankingType) === 2 ? '今日' : '总') + '里程排行榜',
+        alt: '里程排行榜',
+        image: async () => {
+            if (!ctx.puppeteer) return null;
+            let page;
+            try {
+                page = await ctx.puppeteer.page();
+                await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 });
+                await page.goto(`file:///${resolve(__dirname, '../resource/mileage-leaderboard.html')}`);
+                await page.evaluate(`setData(${JSON.stringify(data)})`);
+                await page.waitForNetworkIdle();
+                await common.sleep(500);
+                const element = await page.$("#container");
+                return segment.image(await element.screenshot({ encoding: "binary" }), "image/jpeg");
+            } catch (e) {
+                console.info(e);
+                return null;
+            } finally {
+                if (page) {
+                    try { await page.close(); } catch { }
+                }
+            }
         }
-    }
+    });
 };
+
+/**
+ * 排行榜按钮（仅 QQ 官方机器人可见）。
+ */
+function buildRankingButtons(session, rankingType) {
+    if (!qqOfficial.isQQOfficial(session)) return [];
+    const rows = [];
+    rows.push([qqOfficial.inputButton(
+        Number(rankingType) === 2 ? '查看总榜' : '查看今日榜',
+        Number(rankingType) === 2 ? '里程排行榜' : '今日里程排行榜',
+        true
+    )]);
+    rows.push([qqOfficial.inputButton('我的绑定', '我的绑定')]);
+    return rows;
+}
+
+/**
+ * 排行榜文字版。
+ */
+function buildRankingText(data) {
+    const typeText = Number(data.rankingType) === 2 ? '今日' : '总';
+    const list = Array.isArray(data.mileageRankingList) ? data.mileageRankingList : [];
+    const lines = [`## 里程排行榜（${typeText}）`, ''];
+    list.slice(0, 10).forEach((p, i) => {
+        lines.push(`${i + 1}. ${p.name || '未知'}  ${formatKm(p.mileage)}`);
+    });
+    if (data.playerMileageRanking) {
+        const me = data.playerMileageRanking;
+        const rank = list.indexOf(me) + 1;
+        lines.push('', `**你的排名**：第 ${rank || '-'} 名  ${formatKm(me.mileage)}`);
+    }
+    return lines.join('\n');
+}
+
+function formatKm(v) {
+    const n = Number(v);
+    return Number.isFinite(n) ? `${n.toLocaleString('en-US')} km` : '-';
+}

package/lib/command/tmpPosition.js

@@ -1,6 +1,7 @@
 const { segment } = require('koishi')
 const { resolve } = require('path')
 const guildBind = require('../database/guildBind')
+const qqOfficial = require('../util/qqOfficial')
 const tmpIdPicker = require('../util/tmpIdPicker')
 const truckyAppApi = require('../api/truckyAppApi')
 const truckersMpApi = require('../api/truckersMpApi')
@@ -51,7 +52,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
     // 如果没有传入tmpId，尝试从绑定记录获取（多绑定时会列出序号供选择，支持多选=发多张定位图）
     if (!tmpId) {
-      const bindings = await guildBind.list(ctx.database, session.platform, session.userId)
+      const bindings = await guildBind.listWithUnion(ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session))
       if (bindings.length === 0) {
         return `请输入正确的玩家编号`
       }
@@ -144,7 +145,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       return (
         segment.image(await element.screenshot({
           encoding: "binary"
-        }), "image/jpg")
+        }), "image/jpeg")
       )
     } catch (e) {
       return '渲染异常，请重试'

package/lib/command/tmpQuery/tmpQuery.js

@@ -1,6 +1,32 @@
 const tmpQueryText = require("./tmpQueryText");
 const tmpQueryImg = require("./tmpQueryImg");
+const messageRender = require("../../util/messageRender");
+const qqOfficial = require("../../util/qqOfficial");
+const qqMediaUpload = require("../../util/qqMediaUpload");
+
+/**
+ * 玩家信息查询分发。
+ *
+ * 这里做一层输出包装：
+ * - onebot：原样返回（纯文本字符串 / 图片元素），行为与以前完全一致；
+ * - QQ 官方机器人：文本结果包成 qq:markdown，并在下方附加常用按钮。
+ *
+ * 注意：业务函数可能返回字符串、图片元素、或它们的数组（多绑定查询），
+ * 这里只处理「最终结果」，不改变任何查询逻辑。
+ */
 module.exports = async (ctx, cfg, session, tmpId) => {
+    const result = await queryRaw(ctx, cfg, session, tmpId);
+
+    // 非官方机器人 / 无结果 / 已列出序号等待回复（undefined）→ 原样返回
+    if (!qqOfficial.isQQOfficial(session) || result == null) {
+        return result;
+    }
+
+    return await decorateForOfficial(ctx, cfg, session, result);
+};
+
+/** 按配置分发到文字版或图片版（保持原有逻辑不变） */
+async function queryRaw(ctx, cfg, session, tmpId) {
     switch (cfg.tmpQuery?.type) {
         case 1:
             return await tmpQueryText(ctx, cfg, session, tmpId);
@@ -9,4 +35,47 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         default:
             return '指令配置错误';
     }
-};
+}
+
+/**
+ * 官方机器人下的输出包装。
+ * - 字符串 → qq:markdown + 按钮
+ * - 图片元素 → 图片 + 按钮（renderImage 内部处理）
+ * - 数组 → 逐项处理（多绑定结果）
+ */
+async function decorateForOfficial(ctx, cfg, session, result) {
+    const buttons = buildQueryButtons();
+
+    if (Array.isArray(result)) {
+        return Promise.all(result.map(item => decorateOne(ctx, cfg, session, item, buttons)));
+    }
+    return await decorateOne(ctx, cfg, session, result, buttons);
+}
+
+async function decorateOne(ctx, cfg, session, item, buttons) {
+    if (item == null) return item;
+
+    // 图片元素：交给 renderImage（官方机器人下会变成「图片 + 按钮」）
+    if (typeof item === 'object' && item.type && item.type !== 'text') {
+        return await messageRender.renderImage(session, item, {
+            buttons,
+            uploader: await messageRender.buildUploader(ctx, cfg, session),
+        });
+    }
+
+    const text = typeof item === 'string' ? item : String(item);
+    // 过短的提示语（如「0公里」「请输入正确的玩家编号」）不附加按钮，避免干扰
+    if (text.length < 12) {
+        return await messageRender.renderText(session, text, { markdown: true });
+    }
+    return await messageRender.renderText(session, text, { buttons, markdown: true });
+}
+
+/** 查询结果下方的常用按钮 */
+function buildQueryButtons() {
+    // 每行最多 2 个：手机端一行 4 个会把文字压成「再...」省略号
+    return [
+        [qqOfficial.inputButton('再查一次', '查询', true), qqOfficial.inputButton('我的绑定', '我的绑定')],
+        [qqOfficial.inputButton('里程排行榜', '里程排行榜'), qqOfficial.inputButton('VTC里程榜', 'vtc里程排行榜')],
+    ];
+}

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -1,4 +1,5 @@
 const dayjs = require('dayjs');
+const qqOfficial = require('../../util/qqOfficial');
 const dayjsRelativeTime = require('dayjs/plugin/relativeTime');
 const dayjsLocaleZhCn = require('dayjs/locale/zh-cn');
 const guildBind = require('../../database/guildBind');
@@ -99,7 +100,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
     // 如果没有传入tmpId，尝试从绑定记录获取（多绑定时会列出序号供选择，支持多选）
     if (!tmpId) {
-        const bindings = await guildBind.list(ctx.database, session.platform, session.userId);
+        const bindings = await guildBind.listWithUnion(ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session));
         if (bindings.length === 0) {
             return `请输入正确的玩家编号`;
         }
@@ -119,7 +120,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
     // 「all / 全部」写法：一次性查询全部绑定（受多选上限截断）
     if (tmpIdPicker.isAllArg(tmpId)) {
-        const bindings = await guildBind.list(ctx.database, session.platform, session.userId);
+        const bindings = await guildBind.listWithUnion(ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session));
         const { ids, hint } = await tmpIdPicker.pickAll(ctx, session, bindings);
         if (ids.length === 0) {
             return `请输入正确的玩家编号`;
@@ -272,7 +273,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
                 if (logOutput) {
                     ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的积分`);
                 }
-                const userInfoUrl = `https://${platformUrl}/api/user/info/list?token=${platformToken}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
+                const userInfoUrl = `https://${platformUrl}/api/user/info/list?token=${platformToken}&page=1&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&unionid=&state=0&teamRole=&isExecutive=&isManager=&adminUserId=`;
                 if (logOutput) {
                     ctx.logger.info(`[TMP_BOT] 请求用户信息: ${userInfoUrl}`);
                 }

package/lib/command/tmpQuery/tmpQueryText.js

@@ -1,4 +1,5 @@
 const dayjs = require('dayjs');
+const qqOfficial = require('../../util/qqOfficial');
 const dayjsRelativeTime = require('dayjs/plugin/relativeTime');
 const dayjsLocaleZhCn = require('dayjs/locale/zh-cn');
 const guildBind = require('../../database/guildBind');
@@ -85,7 +86,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
     // 如果没有传入tmpId，尝试从绑定记录获取（多绑定时会列出序号供选择，支持多选）
     if (!tmpId) {
-        const bindings = await guildBind.list(ctx.database, session.platform, session.userId);
+        const bindings = await guildBind.listWithUnion(ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session));
         if (bindings.length === 0) {
             return `请输入正确的玩家编号`;
         }
@@ -105,7 +106,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
     // 「all / 全部」写法：一次性查询全部绑定（受多选上限截断）
     if (tmpIdPicker.isAllArg(tmpId)) {
-        const bindings = await guildBind.list(ctx.database, session.platform, session.userId);
+        const bindings = await guildBind.listWithUnion(ctx.database, session.platform, session.userId, qqOfficial.buildIdentity(session));
         const { ids, hint } = await tmpIdPicker.pickAll(ctx, session, bindings);
         if (ids.length === 0) {
             return `请输入正确的玩家编号`;
@@ -170,7 +171,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
                     if (logOutput) {
                         ctx.logger.info(`[TMP_BOT] tmpQuery：开始查询TmpID ${tmpId} 的积分`);
                     }
-                    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
+                    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=1&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&unionid=&state=0&teamRole=&isExecutive=&isManager=&adminUserId=`;
                     if (logOutput) {
                         ctx.logger.info(`[TMP_BOT] 请求用户信息: ${userInfoUrl}`);
                     }