koishi-plugin-rocom 1.0.18 → 1.0.24

package/lib/commands/merchant.js

@@ -1,9 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMerchantRenderParams = buildMerchantRenderParams;
+exports.buildMerchantCardItems = buildMerchantCardItems;
+exports.buildTodayRows = buildTodayRows;
 exports.register = register;
 const koishi_1 = require("koishi");
 const send_image_1 = require("../send-image");
 const subscription_send_1 = require("../subscription-send");
+const merchant_service_1 = require("../merchant-service");
+const merchant_catalog_1 = require("../merchant-catalog");
+const merchant_clock_1 = require("../merchant-clock");
+const permissions_1 = require("../permissions");
+const subscription_runner_1 = require("../subscription-runner");
+const node_async_hooks_1 = require("node:async_hooks");
+const async_control_1 = require("../async-control");
+const icon_metrics_1 = require("../icon-metrics");
 const logger = new koishi_1.Logger('rocom-merchant');
 const TEXT = {
     merchant: '\u8fdc\u884c\u5546\u4eba',
@@ -28,31 +39,67 @@ const ROUND_WINDOWS = [
     { id: 3, label: '16:00-20:00', startHour: 16, endHour: 20 },
     { id: 4, label: '20:00-24:00', startHour: 20, endHour: 24 },
 ];
-const CHINA_TIMEZONE = 'Asia/Shanghai';
-const chinaPartsFormatter = new Intl.DateTimeFormat('zh-CN', {
-    timeZone: CHINA_TIMEZONE,
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    hour12: false,
-});
+// 商人卡片按原生尺寸渲染：1080 设计稿缩到 1/4 排版，再整体 zoom 放大；
+// 视口宽 960 + deviceScaleFactor 4 → 3840 物理像素输出。
+const MERCHANT_CARD_SOURCE_WIDTH = 1080;
+const MERCHANT_CARD_LAYOUT_SCALE = 0.25;
+const MERCHANT_CARD_OUTPUT_WIDTH = 3840;
+const MERCHANT_CARD_DEVICE_SCALE_FACTOR = 4;
+const MERCHANT_CARD_RENDER_SCALE = MERCHANT_CARD_LAYOUT_SCALE;
+const MERCHANT_CARD_RENDER_WIDTH = Math.ceil(MERCHANT_CARD_OUTPUT_WIDTH / MERCHANT_CARD_DEVICE_SCALE_FACTOR);
+const MERCHANT_CARD_OUTPUT_SCALE = MERCHANT_CARD_RENDER_WIDTH / MERCHANT_CARD_SOURCE_WIDTH;
+const MERCHANT_CARD_RENDER_BASE_WIDTH = MERCHANT_CARD_SOURCE_WIDTH * MERCHANT_CARD_LAYOUT_SCALE;
+const MERCHANT_CARD_RENDER_ZOOM = MERCHANT_CARD_RENDER_WIDTH / MERCHANT_CARD_RENDER_BASE_WIDTH;
+const MERCHANT_CARD_STROKE_11 = 11 * MERCHANT_CARD_RENDER_SCALE;
+const MERCHANT_CARD_STROKE_10 = 10 * MERCHANT_CARD_RENDER_SCALE;
+const MERCHANT_CARD_OFFSET_3 = 3 * MERCHANT_CARD_RENDER_SCALE;
+// 今日卡片商品名只有 8.5px，沿用 11 倍描边半径会把字糊成一坨，单独用小半径
+const MERCHANT_TODAY_NAME_STROKE = 3 * MERCHANT_CARD_RENDER_SCALE;
+// 单件商品卡里 .goods-img-wrap 的尺寸（模板基准 px），图标等面积归一的框；
+// 「不透明内容」统一缩放到的面积约等于 55×55 方图，再大细长商品会溢出图标框。
+const MERCHANT_ICON_BOX_WIDTH = 74;
+const MERCHANT_ICON_BOX_HEIGHT = 61.5;
+const MERCHANT_ICON_TARGET_AREA = 3000;
+// 单个图标取图超时；取不到就按原样渲染，不影响出卡片
+const MERCHANT_ICON_FETCH_TIMEOUT_MS = 8000;
+const MERCHANT_CARD_ICON_BOX = {
+    width: MERCHANT_ICON_BOX_WIDTH,
+    height: MERCHANT_ICON_BOX_HEIGHT,
+    targetArea: MERCHANT_ICON_TARGET_AREA,
+};
+// 今日卡片一轮一行：每行左侧轮次标签，右侧最多并排 5 件商品。
+// 列宽固定（不随该轮商品数变化），否则同一张卡片里图标大小又会参差；
+// 一轮超过 5 件时整行一起收窄、图标框跟着缩，保证不溢出行宽。
+const MERCHANT_TODAY_START_Y = 592;
+const MERCHANT_TODAY_ROW_HEIGHT = 368;
+const MERCHANT_TODAY_ROW_GAP = 32;
+// 底部信息框压在最后一行下沿 21px（沿用旧版 bottomFrameTop = lastTop + 287 算法），
+// 写成正间距会在末尾留出一大片空白。
+const MERCHANT_TODAY_FRAME_OVERLAP = 21;
+const MERCHANT_TODAY_ROW_WIDTH = 260.75;
+const MERCHANT_TODAY_TAB_WIDTH = 38;
+const MERCHANT_TODAY_MAX_COLUMNS = 5;
+const MERCHANT_TODAY_CELL_WIDTH = (MERCHANT_TODAY_ROW_WIDTH - MERCHANT_TODAY_TAB_WIDTH) / MERCHANT_TODAY_MAX_COLUMNS;
+// 今日卡片的商品图标框（模板 .item-icon-wrap）；等面积归一基准，行收窄时按面积比缩小
+const MERCHANT_TODAY_ICON_SIZE = 40;
+const MERCHANT_TODAY_ICON_TARGET_AREA = 1150;
+// 图标尺寸按「去掉签名参数的地址」缓存，避免每次出卡片重复取图；失败缓存 null 不再重试。
+const iconMetricsCache = new Map();
+const defaultClock = new merchant_clock_1.MerchantClock('Asia/Shanghai');
+// Scoped to each synchronous view build; plugin instances never overwrite another clock.
+const clockScope = new node_async_hooks_1.AsyncLocalStorage();
+const currentClock = () => clockScope.getStore() || defaultClock;
 function getChinaParts(input = Date.now()) {
-    const parts = {};
-    const date = input instanceof Date ? input : new Date(input);
-    for (const item of chinaPartsFormatter.formatToParts(date)) {
-        if (item.type !== 'literal')
-            parts[item.type] = item.value;
-    }
+    const ms = input instanceof Date ? input.getTime() : input;
+    const parts = currentClock().parts(ms);
+    const [year, month, day] = parts.date.split('-').map(Number);
     return {
-        year: Number(parts.year || '0'),
-        month: Number(parts.month || '0'),
-        day: Number(parts.day || '0'),
-        hour: Number(parts.hour || '0'),
-        minute: Number(parts.minute || '0'),
-        second: Number(parts.second || '0'),
+        year: year || 0,
+        month: month || 0,
+        day: day || 0,
+        hour: parts.hour,
+        minute: parts.minute,
+        second: parts.second,
     };
 }
 function padNumber(value) {
@@ -62,10 +109,6 @@ function getChinaDateText(input = Date.now()) {
     const parts = getChinaParts(input);
     return `${parts.year}-${padNumber(parts.month)}-${padNumber(parts.day)}`;
 }
-function getChinaDayStartMs(input = Date.now()) {
-    const parts = getChinaParts(input);
-    return new Date(`${parts.year}-${padNumber(parts.month)}-${padNumber(parts.day)}T00:00:00+08:00`).getTime();
-}
 function classifyMerchantItem(item) {
     const start = normalizeTimestamp(item?.start_time);
     const end = normalizeTimestamp(item?.end_time);
@@ -115,34 +158,6 @@ function getMerchantActivity(res) {
     const activities = res?.merchantActivities || res?.merchant_activities || [];
     return activities[0] || {};
 }
-function getMerchantProducts(res) {
-    const activity = getMerchantActivity(res);
-    const groups = [];
-    if (Array.isArray(activity?.products))
-        groups.push(activity.products);
-    if (Array.isArray(activity?.product_list))
-        groups.push(activity.product_list);
-    if (Array.isArray(activity?.get_props))
-        groups.push(activity.get_props);
-    if (Array.isArray(activity?.get_extra_props))
-        groups.push(activity.get_extra_props);
-    if (Array.isArray(activity?.get_pets))
-        groups.push(activity.get_pets);
-    const merged = [];
-    const seen = new Set();
-    for (const list of groups) {
-        for (const item of list) {
-            const start = normalizeTimestamp(item?.start_time) ?? 0;
-            const end = normalizeTimestamp(item?.end_time) ?? Infinity;
-            const key = `${item?.id ?? ''}|${item?.name ?? ''}|${start}|${end === Infinity ? 'inf' : end}`;
-            if (seen.has(key))
-                continue;
-            seen.add(key);
-            merged.push(item);
-        }
-    }
-    return merged;
-}
 function isMerchantItemActive(item, now = Date.now()) {
     const nowMs = now instanceof Date ? now.getTime() : now;
     const start = normalizeTimestamp(item?.start_time);
@@ -154,8 +169,7 @@ function isMerchantItemToday(item, now = Date.now()) {
     const end = normalizeTimestamp(item?.end_time);
     if (start === null || end === null)
         return true;
-    const startOfDay = getChinaDayStartMs(now);
-    const endOfDay = startOfDay + 24 * 60 * 60 * 1000;
+    const { start: startOfDay, end: endOfDay } = currentClock().dayBounds(now instanceof Date ? now.getTime() : now);
     return start < endOfDay && end > startOfDay;
 }
 function getRoundForItem(item, now = Date.now()) {
@@ -200,81 +214,230 @@ function getCurrentMerchantRound(now = new Date()) {
         round_id: `${datePart}-${currentRound || 'closed'}`,
     };
 }
+// @全体 的写法。
+const MENTION_ALL_ALIASES = new Set(['@全体', '全体', '@所有人', 'at全体', 'at所有人']);
 function parseMerchantSubscriptionArgs(args, defaultItems) {
     const parts = (args || '').split(/\s+/).filter(Boolean);
-    let mentionAll = false;
+    let mentionAll = null;
     if (parts[0] === '1' || parts[0] === '0') {
         mentionAll = parts.shift() === '1';
     }
-    const matchAll = parts.length === 1 && parts[0] === '全部';
+    // 支持「订阅远行商人 @全体 1 3」写法。
+    for (let i = parts.length - 1; i >= 0; i--) {
+        if (MENTION_ALL_ALIASES.has(parts[i].toLowerCase())) {
+            mentionAll = true;
+            parts.splice(i, 1);
+        }
+    }
+    const matchAll = parts.length === 1 && (0, merchant_catalog_1.isAllAlias)(parts[0]);
     if (matchAll)
         parts.shift();
     const items = matchAll ? [] : (parts.length ? parts : defaultItems);
     const source = matchAll ? '全部商品' : (parts.length ? TEXT.customSource : TEXT.defaultSource);
-    return {
-        mention_all: mentionAll,
-        match_all: matchAll,
-        items,
-        source,
-    };
+    return { mentionAll, match_all: matchAll, tokens: parts, items, source };
 }
 function getSubscriptionTarget(session) {
     const platform = session.platform || session.bot?.platform || '';
-    const privateChat = !session.guildId;
+    const privateChat = (0, permissions_1.isDirectSession)(session);
     const channelId = session.channelId || session.guildId || session.userId || '';
-    const key = privateChat ? `private_${session.userId}` : session.guildId;
+    const key = privateChat ? `private_${session.userId}` : (session.guildId || channelId);
     return { key, platform, channelId, privateChat };
 }
 function isBotAdmin(session, adminUserIds) {
     return adminUserIds.includes(session?.userId || '');
 }
+// 订阅管理权限：群主/管理员与 Bot 管理员按独立开关生效。
+function canManageGroupSubscription(deps, session) {
+    return (0, permissions_1.canManageSubscription)(deps.config, session);
+}
 function sameStringArray(left, right) {
     return JSON.stringify(left) === JSON.stringify(right);
 }
-function getRandomGoodsMaps(res) {
-    const priceMap = new Map();
-    const limitMap = new Map();
-    const randomGoods = Array.isArray(res?.random_goods)
-        ? res.random_goods
-        : Array.isArray(res?.randomGoods)
-            ? res.randomGoods
-            : [];
-    for (const item of randomGoods) {
-        const name = String(item?.goods_name || item?.name || '').trim();
-        if (!name)
-            continue;
-        if (item?.price !== undefined && item?.price !== null && item.price !== '')
-            priceMap.set(name, item.price);
-        if (item?.buy_limit_num !== undefined && item?.buy_limit_num !== null && item.buy_limit_num !== '') {
-            limitMap.set(name, item.buy_limit_num);
-        }
-    }
-    return { priceMap, limitMap };
-}
-function normalizeMerchantProducts(res, now = new Date()) {
-    return getMerchantProducts(res).map((item) => {
-        const name = String(item?.name || item?.goods_name || TEXT.unknown).trim() || TEXT.unknown;
+function normalizeMerchantProducts(res, now = new Date(), options) {
+    const nowMs = now.getTime();
+    const { items } = (0, merchant_service_1.normalizeMerchant)(res, nowMs, options);
+    return items.map((item) => {
+        const source = { start_time: item.startsAt, end_time: item.endsAt };
         return {
-            name,
-            image: String(item?.icon_url || item?.iconUrl || ''),
-            time_label: formatProductWindow(item),
-            category: classifyMerchantItem(item),
-            round_id: getRoundForItem(item, now),
-            is_active: isMerchantItemActive(item, now),
-            start_time: normalizeTimestamp(item?.start_time),
-            end_time: normalizeTimestamp(item?.end_time),
+            name: item.name,
+            image: item.icon,
+            time_label: formatProductWindow(source),
+            category: classifyMerchantItem(source),
+            round_id: getRoundForItem(source, now),
+            is_active: item.active,
+            start_time: item.startsAt,
+            end_time: item.endsAt,
+            price: item.price,
+            limit: item.limit,
+            item_category: item.category,
+            allDay: item.allDay,
+            goods_id: item.id,
         };
     });
 }
-function buildMerchantCardItems(products, res, options) {
-    const { priceMap, limitMap } = getRandomGoodsMaps(res);
+// 实时接口只给当前轮次的价格，轮次一过就拿不到了；
+// 每次拿到实时数据先按 goods_id + 轮次落盘，供当天后续轮次补价。
+function recordLiveMerchantPrices(deps, res, now = new Date()) {
+    const priceLog = deps.merchantPriceLog;
+    if (!priceLog || !res || res._source !== 'live' || !Array.isArray(res.goods))
+        return;
+    const nowMs = now.getTime();
+    const currentRound = getCurrentMerchantRound(now).current ?? 0;
+    const mapping = new Map();
+    for (const meta of Array.isArray(res.goods_mapping) ? res.goods_mapping : []) {
+        if (meta && meta.goods_id !== undefined && meta.goods_id !== null)
+            mapping.set(String(meta.goods_id), meta);
+    }
+    for (const meta of Array.isArray(res._goods_mapping) ? res._goods_mapping : []) {
+        if (meta && meta.goods_id !== undefined && meta.goods_id !== null && !mapping.has(String(meta.goods_id)))
+            mapping.set(String(meta.goods_id), meta);
+    }
+    const priceOf = (value, key) => {
+        if (value && typeof value === 'object') {
+            const target = value[key] ?? (key === 'real' ? value.origin : value.real);
+            const num = target && typeof target === 'object' ? Number(target.amount) : Number(target);
+            return Number.isFinite(num) && num > 0 ? num : 0;
+        }
+        const num = Number(value);
+        return Number.isFinite(num) && num > 0 ? num : 0;
+    };
+    // 轮次判定：带 next_refresh_time 的随轮次刷新，缺省视为全天（round 0）。
+    const roundOf = (raw) => {
+        const refreshAt = (0, merchant_service_1.merchantTimestampMs)(raw?.next_refresh_time);
+        if (!refreshAt)
+            return 0;
+        return currentRound;
+    };
+    const grouped = new Map();
+    for (const raw of res.goods) {
+        if (!raw || typeof raw !== 'object')
+            continue;
+        const goodsId = raw.goods_id ?? raw.id;
+        const meta = mapping.get(String(goodsId)) || {};
+        const round = roundOf(raw);
+        const list = grouped.get(round) || [];
+        list.push({
+            goods_id: goodsId,
+            goods_name: meta.goods_name || raw.goods_name || raw.name,
+            item_id: meta.item_id,
+            item_num: meta.item_num,
+            buy_limit_num: raw.limit_buy_num,
+            price: priceOf(raw.price, 'real'),
+            origin_price: priceOf(raw.price, 'origin'),
+        });
+        grouped.set(round, list);
+    }
+    for (const [round, list] of grouped) {
+        priceLog.record(list, { now, round });
+    }
+}
+// 今日远行商人：历史轮次商品在实时接口拿不到价格（旧接口 random_goods 恒为 0），
+// 用当天记录下来的实时价格补上。
+function backfillTodayPrices(priceLog, products, now = new Date()) {
+    if (!priceLog)
+        return products;
+    for (const product of products) {
+        if (product.price && product.price > 0)
+            continue;
+        const round = product.round_id ?? getRoundForItem({ start_time: product.start_time, end_time: product.end_time }, now) ?? 0;
+        const found = priceLog.lookup(product.goods_id, product.name, round);
+        if (!found)
+            continue;
+        product.price = found.price;
+        if (product.limit === null || product.limit === undefined)
+            product.limit = found.buy_limit_num || null;
+    }
+    return products;
+}
+function buildMerchantRenderParams(pageHeight) {
+    return {
+        pageHeight,
+        renderWidth: MERCHANT_CARD_RENDER_WIDTH,
+        renderHeight: Math.ceil(pageHeight * MERCHANT_CARD_OUTPUT_SCALE),
+        renderBaseWidth: MERCHANT_CARD_RENDER_BASE_WIDTH,
+        renderBaseHeight: pageHeight * MERCHANT_CARD_LAYOUT_SCALE,
+        renderScale: MERCHANT_CARD_RENDER_SCALE,
+        renderZoom: MERCHANT_CARD_RENDER_ZOOM,
+        renderDeviceScaleFactor: MERCHANT_CARD_DEVICE_SCALE_FACTOR,
+        renderStroke11: MERCHANT_CARD_STROKE_11,
+        renderStroke10: MERCHANT_CARD_STROKE_10,
+        renderStrokeName: MERCHANT_TODAY_NAME_STROKE,
+        renderOffset3: MERCHANT_CARD_OFFSET_3,
+    };
+}
+/** 把图标换算成模板用的 transform；没有测量结果就原样渲染。 */
+function buildMerchantIconStyle(iconUrl, iconMetrics, box = MERCHANT_CARD_ICON_BOX) {
+    const fallback = { iconScale: 1, iconOffsetX: 0, iconOffsetY: 0 };
+    const url = String(iconUrl || '').trim();
+    if (!url || !iconMetrics)
+        return fallback;
+    const fit = (0, icon_metrics_1.buildIconFit)(iconMetrics.get(url), box);
+    return fit
+        ? { iconScale: fit.scale, iconOffsetX: fit.offsetX, iconOffsetY: fit.offsetY }
+        : fallback;
+}
+async function measureMerchantIcon(deps, url) {
+    const cacheKey = String(url || '').trim().split('?')[0];
+    if (!cacheKey)
+        return null;
+    if (iconMetricsCache.has(cacheKey))
+        return iconMetricsCache.get(cacheKey) ?? null;
+    let metrics = null;
+    try {
+        if (!deps.ctx?.http)
+            throw new Error('http service unavailable');
+        const response = await deps.ctx.http('GET', url, {
+            responseType: 'arraybuffer',
+            timeout: MERCHANT_ICON_FETCH_TIMEOUT_MS,
+        });
+        const status = Number(response?.status) || 0;
+        if (status >= 400)
+            throw new Error(`HTTP ${status}`);
+        const body = response?.data;
+        metrics = (0, icon_metrics_1.readImageMetrics)(Buffer.isBuffer(body) ? body : Buffer.from(body || []));
+    }
+    catch (error) {
+        logger.warn(`读取商品图标失败（${cacheKey}）：${error?.message || error}`);
+    }
+    iconMetricsCache.set(cacheKey, metrics);
+    return metrics;
+}
+/** 批量量图标，返回 Map<icon_url, metrics>；个别失败只是缺那一条。 */
+async function collectMerchantIconMetrics(deps, urls) {
+    const unique = [...new Set([...urls].map(url => String(url || '').trim()).filter(Boolean))];
+    const metrics = new Map();
+    await Promise.all(unique.map(async (url) => {
+        const measured = await measureMerchantIcon(deps, url);
+        if (measured)
+            metrics.set(url, measured);
+    }));
+    return metrics;
+}
+/** 收集商人响应里出现过的图标地址（去重）；图标只挂在旧接口的 get_props / get_extra_props / get_pets 上。 */
+function collectMerchantIconUrls(res) {
+    let root = res || {};
+    if (root.result && typeof root.result === 'object')
+        root = root.result;
+    const merchantActivities = Array.isArray(root.merchantActivities)
+        ? root.merchantActivities
+        : Array.isArray(root.merchant_activities) ? root.merchant_activities : [];
+    const urls = new Set();
+    for (const activity of merchantActivities) {
+        for (const key of ['get_props', 'get_extra_props', 'get_pets']) {
+            for (const item of Array.isArray(activity?.[key]) ? activity[key] : []) {
+                const url = String(item?.icon_url || '').trim();
+                if (url)
+                    urls.add(url);
+            }
+        }
+    }
+    return [...urls];
+}
+function buildMerchantGoodsAll(products, options) {
     const catOrder = { round: 0, normal: 1, weekend: 2 };
-    const startY = 592;
-    const cardHeight = 308;
-    const gap = 43;
     const goodsAll = products.map((product) => {
-        const limit = limitMap.get(product.name);
-        const limitText = limit === undefined || limit === null || limit === '' ? '--' : String(limit);
+        const limit = product.limit;
+        const limitText = limit === undefined || limit === null ? '--' : String(limit);
         const isHot = product.category !== 'round';
         const isEnded = options.includeEnded ? !product.is_active : false;
         const roundPrefix = product.round_id ? `第${product.round_id}轮·` : '';
@@ -286,7 +449,7 @@ function buildMerchantCardItems(products, res, options) {
         return {
             goods_name: product.name,
             iconUrl: product.image,
-            price: priceMap.get(product.name) ?? 0,
+            price: product.price ?? 0,
             num: '',
             category: product.category,
             roundId: product.round_id || 0,
@@ -303,15 +466,65 @@ function buildMerchantCardItems(products, res, options) {
             return catOrder[a.category] - catOrder[b.category];
         return Number(b.price || 0) - Number(a.price || 0);
     });
+    return goodsAll;
+}
+function buildMerchantCardItems(products, options) {
+    const startY = 592;
+    const cardHeight = 308;
+    const gap = 43;
+    const goodsAll = buildMerchantGoodsAll(products, options);
     const goods = goodsAll.map((item, index) => ({
         ...item,
+        ...buildMerchantIconStyle(item.iconUrl, options.iconMetrics),
         num: String(index + 1).padStart(2, '0'),
         top: startY + index * (cardHeight + gap),
     }));
     const lastCardTop = goods.length > 0 ? goods[goods.length - 1].top : startY;
     const bottomFrameTop = lastCardTop + 287;
     const pageHeight = bottomFrameTop + 160;
-    return { goods, bottomFrameTop, pageHeight };
+    return { goods, bottomFrameTop, ...buildMerchantRenderParams(pageHeight) };
+}
+/**
+ * 今日卡片按轮次分行：热销（roundId 0，全天/跨天在架）置顶，第 1~4 轮升序。
+ * 每件商品落在哪一轮由商品数据的 roundId 事先算好。
+ */
+function buildTodayRows(goods, currentRoundId, iconMetrics) {
+    const grouped = new Map();
+    for (const item of goods) {
+        const roundId = Number(item.roundId) || 0;
+        if (!grouped.has(roundId))
+            grouped.set(roundId, []);
+        grouped.get(roundId).push(item);
+    }
+    const roundIds = [...grouped.keys()].sort((a, b) => {
+        if (a === 0)
+            return -1;
+        if (b === 0)
+            return 1;
+        return a - b;
+    });
+    const available = MERCHANT_TODAY_ROW_WIDTH - MERCHANT_TODAY_TAB_WIDTH;
+    return roundIds.map((roundId, index) => {
+        const win = ROUND_WINDOWS.find(item => item.id === roundId);
+        const list = grouped.get(roundId);
+        const cellWidth = Math.min(MERCHANT_TODAY_CELL_WIDTH, available / Math.max(list.length, 1));
+        const iconSize = Math.min(MERCHANT_TODAY_ICON_SIZE, cellWidth - 4);
+        const iconBox = {
+            width: iconSize,
+            height: iconSize,
+            targetArea: MERCHANT_TODAY_ICON_TARGET_AREA * ((iconSize / MERCHANT_TODAY_ICON_SIZE) ** 2),
+        };
+        return {
+            roundId,
+            label: win ? `第${roundId}轮` : '热销',
+            timeLabel: win ? `${padNumber(win.startHour)}-${padNumber(win.endHour)}` : '全天',
+            isCurrent: Boolean(currentRoundId) && roundId === currentRoundId,
+            top: MERCHANT_TODAY_START_Y + (index * (MERCHANT_TODAY_ROW_HEIGHT + MERCHANT_TODAY_ROW_GAP)),
+            cellWidth,
+            iconSize,
+            items: list.map(item => ({ ...item, ...buildMerchantIconStyle(item.iconUrl, iconMetrics, iconBox) })),
+        };
+    });
 }
 function getCurrentMerchantProducts(products, roundInfo) {
     return products.filter((product) => {
@@ -386,8 +599,20 @@ function getMerchantDateStr(now = new Date()) {
     const parts = getChinaParts(now);
     return `${parts.month}.${parts.day}`;
 }
-function buildMerchantRenderPayload(res, now = new Date()) {
-    const allProducts = normalizeMerchantProducts(res, now);
+// 商品缺图标时按 item_id/item_kind 拼 Wiki 物品图，仍缺失时用本地 logo 兜底。
+function merchantViewOptions(deps) {
+    const secondsOfDay = (ms) => {
+        const parts = getChinaParts(ms);
+        return parts.hour * 3600 + parts.minute * 60 + parts.second;
+    };
+    return {
+        secondsOfDay,
+        assetBaseUrl: deps.client?.wikiAssetBaseUrl,
+        fallbackIcon: deps.renderer?.resourceUrl?.('img/logo.cVSpb3sL.png') || '',
+    };
+}
+function buildMerchantRenderPayload(res, now = new Date(), options, iconMetrics) {
+    const allProducts = normalizeMerchantProducts(res, now, options);
     const roundInfo = getCurrentMerchantRound(now);
     const products = getCurrentMerchantProducts(allProducts, roundInfo);
     const currentWindow = ROUND_WINDOWS.find(win => win.id === roundInfo.current);
@@ -397,13 +622,13 @@ function buildMerchantRenderPayload(res, now = new Date()) {
     const data = {
         dateStr: getMerchantDateStr(now),
         timeRange,
-        ...buildMerchantCardItems(products, res, { includeEnded: false }),
+        ...buildMerchantCardItems(products, { includeEnded: false, iconMetrics }),
     };
     const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
     return { products, roundInfo, data, fallback };
 }
-function buildLegacyMerchantRenderPayload(res, now = new Date()) {
-    const allProducts = normalizeMerchantProducts(res, now);
+function buildLegacyMerchantRenderPayload(res, now = new Date(), options) {
+    const allProducts = normalizeMerchantProducts(res, now, options);
     const roundInfo = getCurrentMerchantRound(now);
     const products = getCurrentMerchantProducts(allProducts, roundInfo);
     const roundGroups = getLegacyRoundGroups(now, roundInfo);
@@ -421,31 +646,48 @@ function buildLegacyMerchantRenderPayload(res, now = new Date()) {
     const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
     return { products, roundInfo, data, fallback };
 }
-function buildTodayMerchantRenderPayload(res, now = new Date()) {
-    const products = normalizeMerchantProducts(res, now)
+function buildTodayMerchantRenderPayload(res, now = new Date(), options, priceLog, iconMetrics) {
+    const products = backfillTodayPrices(priceLog, normalizeMerchantProducts(res, now, options)
         .filter(product => {
         const source = {
             start_time: product.start_time,
             end_time: product.end_time,
         };
         return isMerchantItemToday(source, now);
-    });
+    }), now);
+    const roundInfo = getCurrentMerchantRound(now);
+    const goodsAll = buildMerchantGoodsAll(products, { includeEnded: true });
+    const rows = buildTodayRows(goodsAll, roundInfo.current, iconMetrics);
+    // 扁平 goods 仍按行序编号，方便日志与订阅侧复用
+    const goods = [];
+    for (const row of rows) {
+        for (const item of row.items) {
+            goods.push({ ...item, num: String(goods.length + 1).padStart(2, '0') });
+        }
+    }
+    const lastRowTop = rows.length > 0 ? rows[rows.length - 1].top : MERCHANT_TODAY_START_Y;
+    const bottomFrameTop = (lastRowTop + MERCHANT_TODAY_ROW_HEIGHT) - MERCHANT_TODAY_FRAME_OVERLAP;
+    const pageHeight = bottomFrameTop + 160;
     const data = {
         dateStr: getMerchantDateStr(now),
-        ...buildMerchantCardItems(products, res, { includeEnded: true }),
+        goods,
+        rows,
+        startTop: MERCHANT_TODAY_START_Y,
+        bottomFrameTop,
+        ...buildMerchantRenderParams(pageHeight),
     };
     const fallback = buildMerchantFallbackText(`今日远行商人 (${getChinaDateText(now)})`, products);
     return { products, data, fallback };
 }
-function buildLegacyTodayMerchantRenderPayload(res, now = new Date()) {
-    const allProducts = normalizeMerchantProducts(res, now)
+function buildLegacyTodayMerchantRenderPayload(res, now = new Date(), options, priceLog) {
+    const allProducts = backfillTodayPrices(priceLog, normalizeMerchantProducts(res, now, options)
         .filter(product => {
         const source = {
             start_time: product.start_time,
             end_time: product.end_time,
         };
         return isMerchantItemToday(source, now);
-    });
+    }), now);
     const roundInfo = getCurrentMerchantRound(now);
     const roundGroups = getLegacyRoundGroups(now, roundInfo);
     for (const product of allProducts) {
@@ -471,45 +713,111 @@ function buildLegacyTodayMerchantRenderPayload(res, now = new Date()) {
 function useLegacyMerchantUi(deps) {
     return deps.config.merchantUiStyle === 'old';
 }
-function buildConfiguredMerchantRenderPayload(deps, res, now = new Date()) {
-    const payload = useLegacyMerchantUi(deps)
-        ? buildLegacyMerchantRenderPayload(res, now)
-        : buildMerchantRenderPayload(res, now);
-    return {
-        ...payload,
-        templateName: useLegacyMerchantUi(deps) ? 'yuanxing-shangren' : 'yuanxing-shangren/merchant',
-    };
+async function buildConfiguredMerchantRenderPayload(deps, res, now = new Date()) {
+    const options = merchantViewOptions(deps);
+    return clockScope.run(new merchant_clock_1.MerchantClock(deps.config.merchantTimezone || 'Asia/Shanghai'), async () => {
+        if (useLegacyMerchantUi(deps)) {
+            return {
+                ...buildLegacyMerchantRenderPayload(res, now, options),
+                templateName: 'yuanxing-shangren',
+            };
+        }
+        const iconMetrics = await collectMerchantIconMetrics(deps, collectMerchantIconUrls(res));
+        return {
+            ...buildMerchantRenderPayload(res, now, options, iconMetrics),
+            templateName: 'yuanxing-shangren/merchant',
+        };
+    });
 }
-function buildConfiguredTodayMerchantRenderPayload(deps, res, now = new Date()) {
-    const payload = useLegacyMerchantUi(deps)
-        ? buildLegacyTodayMerchantRenderPayload(res, now)
-        : buildTodayMerchantRenderPayload(res, now);
-    return {
-        ...payload,
-        templateName: useLegacyMerchantUi(deps) ? 'yuanxing-shangren' : 'yuanxing-shangren/today',
-    };
+async function buildConfiguredTodayMerchantRenderPayload(deps, res, now = new Date()) {
+    const options = merchantViewOptions(deps);
+    return clockScope.run(new merchant_clock_1.MerchantClock(deps.config.merchantTimezone || 'Asia/Shanghai'), async () => {
+        if (useLegacyMerchantUi(deps)) {
+            return {
+                ...buildLegacyTodayMerchantRenderPayload(res, now, options, deps.merchantPriceLog),
+                templateName: 'yuanxing-shangren',
+            };
+        }
+        const iconMetrics = await collectMerchantIconMetrics(deps, collectMerchantIconUrls(res));
+        return {
+            ...buildTodayMerchantRenderPayload(res, now, options, deps.merchantPriceLog, iconMetrics),
+            templateName: 'yuanxing-shangren/today',
+        };
+    });
+}
+// 读取订阅当日已推送的全天商品名集合（跨天自动失效）。
+function getAlldayPushedNames(sub, todayKey) {
+    const state = sub.allday_pushed;
+    if (!state || state.date !== todayKey)
+        return new Set();
+    return new Set((state.names || []).map(String));
+}
+// 把本次推送命中的全天商品记入当日已推送状态。
+function recordAlldayPushed(sub, todayKey, names) {
+    const existing = sub.allday_pushed?.date === todayKey ? [...(sub.allday_pushed.names || [])] : [];
+    for (const name of names) {
+        if (!existing.includes(name))
+            existing.push(name);
+    }
+    return existing.length ? { date: todayKey, names: existing } : undefined;
 }
-async function checkMerchantSubscriptions(deps) {
+async function checkMerchantSubscriptions(deps, signal) {
     const { ctx, client, merchantSubMgr, renderer, config } = deps;
-    const res = await client.getMerchantInfo(ctx, true);
-    if (!res)
-        return { subscriptions: 0, matched: 0, pushed: 0 };
-    const { products, roundInfo, data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
+    const subs = merchantSubMgr.getAll();
+    if (!Object.keys(subs).length)
+        return { subscriptions: 0, matched: 0, pushed: 0, kind: 'no-subscriptions' };
+    if (signal?.aborted)
+        return { subscriptions: 0, matched: 0, pushed: 0, kind: 'cancelled' };
+    const res = await client.getMerchantInfo(ctx, true, { signal });
+    if (signal?.aborted)
+        return { subscriptions: 0, matched: 0, pushed: 0, kind: 'cancelled' };
+    // 接口失败视为空结果等待稍后重试，不再发送空商品图片。
+    if (!res) {
+        logger.warn(`远行商人订阅查询失败：${client.getLastErrorBrief?.() || '接口无返回'}，等待重试`);
+        return { subscriptions: Object.keys(subs).length, matched: 0, pushed: 0, kind: 'error' };
+    }
+    recordLiveMerchantPrices(deps, res);
+    const { products, roundInfo, data, fallback, templateName } = await buildConfiguredMerchantRenderPayload(deps, res);
+    if (!products.length)
+        return { subscriptions: Object.keys(subs).length, matched: 0, pushed: 0, kind: 'empty' };
     const productNames = products.map((p) => p.name || '').filter(Boolean);
-    const rendered = await renderer.renderHtml(ctx, templateName, data);
+    // 开启后全天商品每个订阅每天只推送一次；仅作用于按商品名订阅的推送，
+    // “全部商品”订阅仍是每轮推送整张商人图。
+    const alldayNames = config.merchantAllDayOnceEnabled ? (0, merchant_service_1.collectAllDayProductNames)(products) : new Set();
+    const todayKey = new merchant_clock_1.MerchantClock(config.merchantTimezone || 'Asia/Shanghai').date();
+    const rendered = await renderer.renderHtml(ctx, templateName, data, { signal });
     const renderedImage = rendered ? (0, send_image_1.compressPngImage)(rendered, config) : null;
-    const subs = merchantSubMgr.getAll();
     let matchedCount = 0;
     let pushedCount = 0;
     for (const [key, sub] of Object.entries(subs)) {
+        if (signal?.aborted)
+            break;
+        if (JSON.stringify(merchantSubMgr.getAll()[key]) !== JSON.stringify(sub))
+            continue;
         const matchAll = !!sub.match_all;
-        const matched = matchAll
+        let matched = matchAll
             ? productNames
             : sub.items.filter((item) => productNames.some(n => n.includes(item)));
         if (!matchAll && !matched.length)
             continue;
         if (matchAll && !products.length)
             continue;
+        // 当天已推送过的全天商品不再计入本轮命中，全部被剔除则本轮不推送。
+        // 订阅词条按子串匹配商品名，只有词条命中的商品全部为全天时才按全天去重。
+        const onlyAlldayItem = (item) => {
+            if (!alldayNames.size)
+                return false;
+            const hits = productNames.filter(n => n.includes(item));
+            return hits.length > 0 && hits.every(n => alldayNames.has(n));
+        };
+        let pushItems = matched;
+        if (!matchAll && alldayNames.size) {
+            const pushedToday = getAlldayPushedNames(sub, todayKey);
+            if (pushedToday.size)
+                pushItems = matched.filter(item => !(onlyAlldayItem(item) && pushedToday.has(item)));
+        }
+        if (!matchAll && !pushItems.length)
+            continue;
         matchedCount++;
         if (matchAll) {
             if (sub.last_push_round === roundInfo.round_id)
@@ -521,7 +829,7 @@ async function checkMerchantSubscriptions(deps) {
         }
         const msg = matchAll
             ? `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}`
-            : `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}\n\u5339\u914d\u8ba2\u9605\uff1a${matched.join('\u3001')}`;
+            : `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}\n\u5339\u914d\u8ba2\u9605\uff1a${pushItems.join('\u3001')}`;
         const platform = sub.platform || ctx.bots[0]?.platform;
         const channelId = sub.channel_id || sub.group_id || sub.user_id || key;
         if (!platform || !channelId) {
@@ -534,118 +842,228 @@ async function checkMerchantSubscriptions(deps) {
             channelId,
             guildId: sub.group_id || '',
             userId: sub.user_id || '',
-        }, renderedImage, fallbackText, !!sub.mention_all);
-        if (!sent)
+            selfId: sub.self_id || '',
+        }, renderedImage, fallbackText, !!sub.mention_all, signal);
+        if (!sent || signal?.aborted || JSON.stringify(merchantSubMgr.getAll()[key]) !== JSON.stringify(sub))
             continue;
         pushedCount++;
         merchantSubMgr.upsert(key, {
             ...sub,
             last_push_round: roundInfo.round_id,
             last_matched_items: matched,
+            allday_pushed: matchAll || !alldayNames.size
+                ? sub.allday_pushed
+                : recordAlldayPushed(sub, todayKey, pushItems.filter(onlyAlldayItem)),
         });
     }
-    return { subscriptions: Object.keys(subs).length, matched: matchedCount, pushed: pushedCount };
+    return { subscriptions: Object.keys(subs).length, matched: matchedCount, pushed: pushedCount, kind: 'success' };
 }
 function register(deps) {
+    const merchantRunner = (0, subscription_runner_1.createRunner)(deps.ctx);
+    const merchantClock = new merchant_clock_1.MerchantClock(deps.config.merchantTimezone || 'Asia/Shanghai');
     const { ctx, config, client, merchantSubMgr } = deps;
     ctx.command(TEXT.merchant, '\u67e5\u770b\u8fdc\u884c\u5546\u4eba\u5546\u54c1')
         .alias('yxsr')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
             return `\u83b7\u53d6\u8fdc\u884c\u5546\u4eba\u6570\u636e\u5931\u8d25\uff1a${client.getLastErrorBrief()}`;
-        const { data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
+        recordLiveMerchantPrices(deps, res);
+        const { data, fallback, templateName } = await buildConfiguredMerchantRenderPayload(deps, res);
         const png = await deps.renderer.renderHtml(ctx, templateName, data);
         await (0, send_image_1.sendImageWithFallback)(session, png, fallback, 'merchant:yuanxing-shangren', deps.config);
     });
     ctx.command(TEXT.todayMerchant, '查看今日远行商人全部商品')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
             return `获取今日远行商人数据失败：${client.getLastErrorBrief()}`;
-        const { data, fallback, templateName } = buildConfiguredTodayMerchantRenderPayload(deps, res);
+        recordLiveMerchantPrices(deps, res);
+        const { data, fallback, templateName } = await buildConfiguredTodayMerchantRenderPayload(deps, res);
         const png = await deps.renderer.renderHtml(ctx, templateName, data);
         await (0, send_image_1.sendImageWithFallback)(session, png, fallback, 'merchant:yuanxing-shangren:today', deps.config);
     });
+    // 查看商品目录与订阅序号。
+    ctx.command('商人商品', '查看远行商人商品列表与订阅序号')
+        .alias('洛克.商人商品')
+        .alias('洛克商人商品')
+        .userFields(['authority'])
+        .action(async () => {
+        const catalog = await deps.merchantCatalog.getCatalog();
+        if (!catalog.length)
+            return '暂时取不到远行商人商品列表，请稍后再试。';
+        const lines = [
+            `远行商人商品列表（共 ${catalog.length} 件）`,
+            `订阅写法：${TEXT.subscribe} 1 3 5，也可以用商品名`,
+            '',
+        ];
+        for (const item of catalog)
+            lines.push(`${item.index}. ${item.name}`);
+        return lines.join('\n');
+    });
     ctx.command(`${TEXT.subscribe} [args:text]`, '\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\u63d0\u9192')
+        .userFields(['authority'])
         .action(async ({ session }, args) => {
         const target = getSubscriptionTarget(session);
-        if (!target.privateChat && !isBotAdmin(session, config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.privateChat && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         if (target.privateChat && !config.merchantPrivateSubscriptionEnabled)
             return '个人私聊订阅功能已被禁用，请联系机器人管理员。';
         const parsed = parseMerchantSubscriptionArgs(args, config.merchantSubscriptionItems);
         const existing = merchantSubMgr.get(target.key);
+        // 序号 / 商品名 / 全部 都经商品目录解析，序号命中后换成规范名落盘。
+        const catalog = await deps.merchantCatalog.getCatalog();
+        const resolved = (0, merchant_catalog_1.resolveMerchantSelection)(parsed.tokens, catalog);
+        const matchAll = parsed.match_all || resolved.all;
+        const hasInput = parsed.match_all || parsed.tokens.length > 0;
+        if (hasInput && !matchAll && !resolved.names.length) {
+            return [
+                `没有识别到可订阅的商品：${resolved.unknownIndexes.join('、') || parsed.tokens.join('、')}`,
+                `先用 商人商品 查看商品序号，再按序号或名称订阅。`,
+            ].join('\n');
+        }
+        // 不带商品参数重复订阅时，沿用上次配置（全部模式或商品列表），
+        // 而不是悄悄重置成配置默认商品。
+        let sourceHint;
+        let items;
+        if (matchAll) {
+            items = [];
+            sourceHint = '全部商品（每轮推送）';
+        }
+        else if (resolved.names.length) {
+            items = resolved.names;
+            sourceHint = '本次指定';
+        }
+        else if (existing && (existing.match_all || (existing.items || []).length > 0)) {
+            items = existing.items || [];
+            sourceHint = '沿用上次配置';
+        }
+        else {
+            items = config.merchantSubscriptionItems;
+            sourceHint = '默认商品配置';
+        }
+        const matchAllFinal = matchAll || (resolved.names.length === 0 && !hasInput && existing?.match_all === true);
+        // 未显式指定 1/0 或 @全体 时沿用上次设置。
+        const mentionAll = target.privateChat
+            ? false
+            : (parsed.mentionAll === null ? (existing?.mention_all ?? false) : parsed.mentionAll);
         merchantSubMgr.upsert(target.key, {
             group_id: session.guildId || '',
             user_id: target.privateChat ? session.userId : '',
             type: target.privateChat ? '个人订阅' : '群订阅',
             channel_id: target.channelId,
             platform: target.platform,
-            items: parsed.items,
-            match_all: parsed.match_all,
-            mention_all: target.privateChat ? false : parsed.mention_all,
+            self_id: session.selfId || session.bot?.selfId || '',
+            items,
+            match_all: matchAllFinal,
+            mention_all: mentionAll,
             last_push_round: existing?.last_push_round ?? null,
             last_matched_items: existing?.last_matched_items ?? [],
+            allday_pushed: existing?.allday_pushed,
             updated_by: session.userId,
         });
-        return `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff1a${parsed.match_all ? '\u5168\u90e8\u5546\u54c1\uff08\u6bcf\u8f6e\u63a8\u9001\uff09' : parsed.items.join('\u3001')}\uff08${parsed.source}\uff09\uff1b${target.privateChat ? '个人订阅' : (parsed.mention_all ? '\u547d\u4e2d\u540e\u4f1a @\u5168\u4f53' : '\u547d\u4e2d\u540e\u4e0d @\u5168\u4f53')}`;
+        const lines = [
+            `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff08${target.privateChat ? '个人订阅' : '本群订阅'}）：${matchAllFinal ? '全部商品（每轮推送整张商人图）' : `监听 ${items.length} 件商品`}`,
+        ];
+        if (!matchAllFinal)
+            lines.push(`监听商品：${(0, merchant_catalog_1.describeMerchantItems)(items, catalog)}`);
+        lines.push(`商品来源：${sourceHint}。`);
+        lines.push(mentionAll ? '命中后会尝试 @全体。' : '命中后不会 @全体。');
+        if (resolved.unknownIndexes.length)
+            lines.push(`未找到的序号：${resolved.unknownIndexes.join('、')}（已忽略）。`);
+        if (resolved.unrecognizedNames.length)
+            lines.push(`商品目录里没有：${resolved.unrecognizedNames.join('、')}（已按原名订阅）。`);
+        lines.push('');
+        lines.push('可用格式：');
+        lines.push(`${TEXT.subscribe} 1 3 国王球  按序号或名称订阅`);
+        lines.push(`${TEXT.subscribe} 全部  订阅全部商品，每轮推送整张商人图`);
+        lines.push(`${TEXT.subscribe} @全体 1 3  命中后尝试 @全体`);
+        lines.push(`商人商品  查看商品序号`);
+        return lines.join('\n');
     });
     ctx.command(TEXT.viewSubscribe, '\u67e5\u770b\u5f53\u524d\u4f1a\u8bdd\u7684\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const target = getSubscriptionTarget(session);
-        if (!target.privateChat && !isBotAdmin(session, config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.privateChat && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         const sub = merchantSubMgr.get(target.key);
         const scopeName = target.privateChat ? '你' : '当前群组';
         if (!sub)
             return `${scopeName}未订阅远行商人。\n用法：${TEXT.subscribe} [1/0] [商品名1] [商品名2] ...\n或：${TEXT.subscribe} 全部（每轮直接推送整张商人图）`;
-        const itemsText = sub.match_all ? '全部商品（每轮推送）' : sub.items.join('、');
+        const catalog = await deps.merchantCatalog.getCatalog();
+        const itemsText = sub.match_all ? '全部商品（每轮推送）' : (0, merchant_catalog_1.describeMerchantItems)(sub.items || [], catalog) || (sub.items || []).join('、');
         return `${scopeName}订阅商品：${itemsText}\n提醒方式：${target.privateChat ? '私聊提醒' : (sub.mention_all ? '@全体' : '普通提醒')}`;
     });
     ctx.command(TEXT.unsubscribe, '\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const target = getSubscriptionTarget(session);
-        if (!target.privateChat && !isBotAdmin(session, config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.privateChat && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         merchantSubMgr.delete(target.key);
         return '\u2705 \u5df2\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605\u3002';
     });
     ctx.command('洛克').subcommand('.调试远行商人订阅', '立即执行一次远行商人订阅检查')
         .alias('洛克调试远行商人订阅')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         if (!isBotAdmin(session, config.adminUserIds))
             return '此指令仅限管理员使用。';
-        const result = await checkMerchantSubscriptions(deps);
+        const result = await merchantRunner(signal => checkMerchantSubscriptions(deps, signal));
+        if (!result)
+            return '订阅检查正在运行或插件已停止。';
         return `远行商人订阅检查完成：订阅 ${result.subscriptions} 条，命中 ${result.matched} 条，推送 ${result.pushed} 条。`;
     });
+    const roundKey = () => {
+        const p = merchantClock.parts();
+        return p.date + ':' + Math.floor(p.hour / 4);
+    };
+    const runMerchantCheck = () => merchantRunner(async (signal) => {
+        const round = roundKey();
+        for (let retry = 0; retry <= 3; retry++) {
+            if (signal.aborted || (retry > 0 && roundKey() !== round))
+                return;
+            if (!Object.keys(merchantSubMgr.getAll()).length)
+                return;
+            const result = await checkMerchantSubscriptions(deps, signal);
+            // 接口失败与空结果一样等待稍后重试，避免直接放弃本轮推送。
+            if ((result.kind !== 'empty' && result.kind !== 'error') || retry === 3)
+                return;
+            await (0, async_control_1.delay)(240000 + Math.floor(Math.random() * 60001) - 30000, signal);
+        }
+    }).catch(err => { if (!merchantRunner.aborted())
+        logger.warn('远行商人订阅检查失败: ' + err); });
     if (config.merchantSubscriptionEnabled) {
-        // 上游 v3.1.0：检查前加入 ±30s 随机延迟，降低刷新窗口和并发请求冲突。
-        const MERCHANT_JITTER_MS = 30000;
-        const runCheckWithJitter = () => {
-            const jitter = Math.floor(Math.random() * MERCHANT_JITTER_MS);
-            setTimeout(() => {
-                checkMerchantSubscriptions(deps).catch(err => logger.warn(`远行商人订阅检查失败: ${err}`));
-            }, jitter);
-        };
         if (config.merchantCheckMode === 'times' && config.merchantCheckTimes.length > 0) {
-            let lastMerchantCheckKey = '';
-            ctx.setInterval(async () => {
-                const now = new Date();
-                const timeStr = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-                if (!config.merchantCheckTimes.includes(timeStr))
+            const times = config.merchantCheckTimes.filter(value => /^([01]\d|2[0-3]):[0-5]\d$/.test(value));
+            let lastWallKey = '';
+            const schedule = (after = Date.now()) => {
+                if (merchantRunner.aborted())
+                    return;
+                const target = merchantClock.nextTimeFor(times, after);
+                if (target === null)
                     return;
-                const checkKey = `${now.toDateString()}-${timeStr}`;
-                if (checkKey === lastMerchantCheckKey)
+                const wallKey = merchantClock.date(target) + ':' + merchantClock.timeText(target);
+                if (wallKey === lastWallKey) {
+                    schedule(target);
                     return;
-                lastMerchantCheckKey = checkKey;
-                runCheckWithJitter();
-            }, 60000);
+                }
+                const jitter = Math.floor(Math.random() * 60001) - 30000;
+                ctx.setTimeout(() => {
+                    lastWallKey = wallKey;
+                    void runMerchantCheck();
+                    schedule(target);
+                }, Math.max(0, target + jitter - Date.now()));
+            };
+            schedule();
         }
         else {
-            ctx.setInterval(async () => {
-                runCheckWithJitter();
-            }, config.merchantCheckInterval);
+            ctx.setInterval(() => {
+                ctx.setTimeout(() => { void runMerchantCheck(); }, Math.floor(Math.random() * 30001));
+            }, Math.max(30000, config.merchantCheckInterval || 300000));
         }
     }
 }