feat(admin): A1 管理后台收敛 Java 单后台完整实现并修复 guard 误拦内部令牌

- Java 补齐后台全部迁移差集:shopduplicatecheck 店铺数据重复检查模块(V108 扫描表+查询/扫描服务)、
  PinyinAbbrUtil 拼音缩写、ImageHistory 接口调整为内部可用、AdminUser 支持内部令牌操作并放宽列表上限
- Flask 后台 admin_api.py 路由收敛转发 Java、admin.html/admin.js 适配新后台形态
- AdminApiGuardFilter 对可信 X-Internal-Token 放行(controller 自校验兜底),修复客户端仅凭
  内部令牌调用 /api/admin/shop-manages/credential 被误拦 401
- 测试:AdminApiGuardFilterTest 补可信/假令牌用例;AdminUserServiceTest 补菜单权限 mock;
  shopduplicatecheck 新增查询/聚合/CSV 单测

backend/app.py

@@ -12,7 +12,7 @@ from flask_cors import CORS
 from utils.db import init_db
 from blueprints.auth import auth
 from blueprints.main import main
-from blueprints.admin_api import admin_api, start_duplicate_scan_scheduler
+from blueprints.admin_api import admin_api
 from blueprints.version import version_bp
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -50,8 +50,6 @@ app.register_blueprint(version_bp)
 
 def run_app(host='0.0.0.0', port=15124):
     init_db()
-    # 每日凌晨全量扫描重复 ASIN，结果缓存 MySQL，页面读取缓存不再实时拉取 Excel
-    start_duplicate_scan_scheduler(app)
     app.run(host=host, port=port, threaded=True, use_reloader=False)
 
 

backend/blueprints/admin_api.py

@@ -15,8 +15,6 @@ from pathlib import Path
 from urllib.parse import quote
 
 import requests
-from openpyxl import load_workbook
-from openpyxl.utils.exceptions import InvalidFileException
 from requests.adapters import HTTPAdapter
 from flask import (
     Blueprint,
@@ -436,7 +434,7 @@ class _PermissionProxyError(Exception):
 
 
 def _proxy_permission_java(
-        method, path, *, params=None, json_data=None, files=None, data=None, current_row=None):
+        method, path, *, params=None, json_data=None, files=None, data=None, current_row=None, timeout=10):
     """Call Java permission APIs using either forwarded JWT or trusted Flask identity."""
     proxy_params = {}
     request_row = getattr(g, '_current_user_row', None) if has_request_context() else None
@@ -458,6 +456,7 @@ def _proxy_permission_java(
         files=files,
         data=data,
         headers=headers,
+        timeout=timeout,
     )
     return result, error_response, status
 
@@ -1826,477 +1825,6 @@ def _load_shop_data_crawl_download_rows(result_ids):
         conn.close()
 
 
-_SHOP_DATA_CRAWL_ASIN_ANALYSIS_MAX_BYTES = 256 * 1024 * 1024
-_SHOP_DATA_CRAWL_ASIN_ANALYSIS_TIMEOUT = (10, 60)
-
-# 重复 ASIN 扫描缓存：结果存 MySQL（shop_data_duplicate_scan 表），
-# 定时任务每天凌晨执行一次全量扫描，页面读取最近一次结果，避免实时拉取 Excel 消耗资源。
-_DUPLICATE_SCAN_TABLE = 'shop_data_duplicate_scan'
-_duplicate_scan_lock = threading.Lock()
-_duplicate_scan_running = False
-
-
-def _ensure_duplicate_scan_table():
-    """按需建表：重复 ASIN 扫描结果缓存表。"""
-    conn = get_db()
-    try:
-        with conn.cursor() as cur:
-            cur.execute(
-                f"""
-                CREATE TABLE IF NOT EXISTS {_DUPLICATE_SCAN_TABLE} (
-                    id BIGINT AUTO_INCREMENT PRIMARY KEY,
-                    status VARCHAR(16) NOT NULL,
-                    error_text TEXT NULL,
-                    summary_json MEDIUMTEXT NULL,
-                    payload_json MEDIUMTEXT NULL,
-                    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                    finished_at DATETIME NULL,
-                    KEY idx_status_created (status, created_at)
-                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
-                """
-            )
-        conn.commit()
-    finally:
-        conn.close()
-
-
-def _save_duplicate_scan(status, summary=None, payload=None, error_text=None):
-    """保存一次扫描结果记录；status: SUCCESS / FAILED。"""
-    import json as _json
-    conn = get_db()
-    scan_id = None
-    try:
-        with conn.cursor() as cur:
-            cur.execute(
-                f'INSERT INTO {_DUPLICATE_SCAN_TABLE} (status, error_text, summary_json, payload_json, created_at, finished_at) '
-                'VALUES (%s, %s, %s, %s, NOW(), NOW())',
-                (
-                    status,
-                    error_text,
-                    _json.dumps(summary or {}, ensure_ascii=False),
-                    _json.dumps(payload or [], ensure_ascii=False),
-                ),
-            )
-            scan_id = cur.lastrowid
-        conn.commit()
-        return scan_id
-    finally:
-        conn.close()
-
-
-def _latest_duplicate_scan():
-    """最近一次成功扫描记录：{'scanned_at': str, 'summary': dict, 'items': list, 'shops': list}|None。
-
-    兼容两种缓存格式：
-    - 新版（重复检查页）：payload = {'shops': [...], 'items': [...]}
-    - 旧版（跨店重复明细）：payload 直接为 items 列表，shops 由明细推导。
-    """
-    import json as _json
-    conn = get_db()
-    try:
-        with conn.cursor() as cur:
-            cur.execute(
-                f'SELECT id, summary_json, payload_json, created_at FROM {_DUPLICATE_SCAN_TABLE} '
-                "WHERE status = 'SUCCESS' ORDER BY id DESC LIMIT 1"
-            )
-            row = cur.fetchone()
-    finally:
-        conn.close()
-    if not row:
-        return None
-    summary_raw = row.get('summary_json') or {}
-    payload = row.get('payload_json') or '[]'
-    # summary_json / payload_json 在 MySQL 中为 JSON 字符串，读取后需反序列化
-    summary = _json.loads(summary_raw) if isinstance(summary_raw, str) else (summary_raw or {})
-    summary = summary if isinstance(summary, dict) else {}
-    payload = _json.loads(payload) if isinstance(payload, str) else (payload or [])
-    if isinstance(payload, dict):
-        shops = payload.get('shops') or []
-        items = payload.get('items') or []
-    else:
-        # 旧格式缓存：兼容旧页面，店铺概览由明细推导
-        items = payload if isinstance(payload, list) else []
-        shop_seen = {}
-        for item in items:
-            for occ in (item.get('occurrences') or []):
-                shop_name = occ.get('shop_name') or ''
-                shop_seen[shop_name] = shop_seen.get(shop_name, 0) + 1
-        shops = [
-            {'shop_name': shop_name, 'asin_count': 0, 'group_name': ''}
-            for shop_name in sorted(shop_seen, key=lambda name: (-shop_seen[name], name))
-        ]
-    return {
-        'scanned_at': str(row.get('created_at') or ''),
-        'summary': summary,
-        'items': items if isinstance(items, list) else [],
-        'shops': shops if isinstance(shops, list) else [],
-    }
-
-
-def _shop_data_crawl_fetch_result_bytes(row, timeout=None):
-    """从 Java 下载接口拉取结果文件字节流（仅内存，不落盘）。"""
-    # row 支持 id（下载行）或 result_id（管理列集别名）
-    result_id = row.get('id') or row.get('result_id') or 0
-    url = f"{backend_java_base_url}/api/admin/shop-data-crawl/results/{int(result_id)}/download"
-    headers, params = _backend_java_internal_request()
-    response = _get_backend_java_session().get(
-        url,
-        params=params,
-        headers=headers,
-        stream=True,
-        timeout=timeout or _SHOP_DATA_CRAWL_ASIN_ANALYSIS_TIMEOUT,
-    )
-    try:
-        response.raise_for_status()
-        total = 0
-        chunks = []
-        for chunk in response.iter_content(chunk_size=1024 * 1024):
-            if not chunk:
-                continue
-            total += len(chunk)
-            if total > _SHOP_DATA_CRAWL_ASIN_ANALYSIS_MAX_BYTES:
-                raise ValueError('结果文件过大，无法分析')
-            chunks.append(chunk)
-        raw = b''.join(chunks)
-        if not raw:
-            raise ValueError(f'结果文件为空 result_id={result_id}')
-        # Java 内部端点鉴权/归属失败时返回 JSON 错误体（HTTP 200），解析报错更直观
-        if raw.lstrip().startswith(b'{'):
-            try:
-                err_payload = json.loads(raw.decode('utf-8', 'replace'))
-                message = err_payload.get('message') or err_payload.get('error') or '未知错误'
-            except ValueError:
-                message = raw[:200].decode('utf-8', 'replace')
-            raise ValueError(f'结果文件下载失败 result_id={result_id}: {message}')
-        return raw
-    finally:
-        response.close()
-
-
-def _shop_data_crawl_cell_text(cell):
-    """读取单元格文本：日期/数字等统一转字符串，None 返回空串。"""
-    if cell is None:
-        return ''
-    value = cell.value
-    if value is None:
-        return ''
-    if isinstance(value, datetime):
-        return value.strftime('%Y-%m-%d')
-    if isinstance(value, float) and value.is_integer():
-        return str(int(value))
-    return str(value).strip()
-
-
-def _shop_data_date_key(date_text):
-    """把各种日期文本归一化为 YYYY-MM-DD，供范围比较。
-
-    支持：ISO（2026-08-19）、中文（2026年8月19日 上午4:34）、
-    yyyy.m.d / yyyy/m/d 等常见格式；无法识别时返回原字符串。
-    """
-    text = (date_text or '').strip()
-    if not text:
-        return ''
-    if len(text) >= 10 and text[4] == '-' and text[7] == '-':
-        return text[:10]
-    year = month = day = None
-    m = re.search(r'(\d{4})\s*[年./-]\s*(\d{1,2})\s*[月./-]\s*(\d{1,2})', text)
-    if m:
-        year, month, day = int(m.group(1)), int(m.group(2)), int(m.group(3))
-    if year and month and day:
-        try:
-            return f'{year:04d}-{month:02d}-{day:02d}'
-        except ValueError:
-            return text
-    return text
-
-
-_SHOP_DATA_SHEET_COUNTRY_MAP = {
-    '英国': 'UK', 'uk': 'UK', 'u.k.': 'UK', 'united kingdom': 'UK',
-    '德国': 'DE', 'de': 'DE', 'germany': 'DE',
-    '法国': 'FR', 'fr': 'FR', 'france': 'FR',
-    '意大利': 'IT', 'it': 'IT', 'italy': 'IT',
-    '西班牙': 'ES', 'es': 'ES', 'spain': 'ES',
-}
-
-
-def _shop_data_sheet_country(sheet_name):
-    """结果文件 sheet 名 → 国家码（英国/德国/法国…）；无法识别返回空串。"""
-    key = str(sheet_name or '').strip().lower()
-    return _SHOP_DATA_SHEET_COUNTRY_MAP.get(key, '')
-
-
-def _shop_data_crawl_parse_workbook(workbook):
-    """从结果 Workbook 提取 ASIN 行：字典列表，表头按 日期/ASIN/…/价格/…/品牌 识别，跳过无 ASIN 行。
-
-    每行附带所在 sheet 映射的国家码 country（记录级站点，供重复检查页按站点筛选/展示）。
-    """
-    rows = []
-    for sheet in workbook.worksheets:
-        header_cells = list(next(sheet.iter_rows(min_row=1, max_row=1), []))
-        header = [_shop_data_crawl_cell_text(cell) for cell in header_cells]
-        try:
-            asin_col = header.index('ASIN')
-        except ValueError:
-            continue
-        date_col = header.index('日期') if '日期' in header else None
-        price_col = header.index('价格') if '价格' in header else None
-        brand_col = header.index('品牌') if '品牌' in header else None
-        sheet_country = _shop_data_sheet_country(sheet.title)
-        for sheet_row in sheet.iter_rows(min_row=2):
-            asin = _shop_data_crawl_cell_text(sheet_row[asin_col])
-            if not asin:
-                continue
-            rows.append({
-                'asin': asin,
-                'date': _shop_data_crawl_cell_text(sheet_row[date_col]) if date_col is not None else '',
-                'price': _shop_data_crawl_cell_text(sheet_row[price_col]) if price_col is not None else '',
-                'brand': _shop_data_crawl_cell_text(sheet_row[brand_col]) if brand_col is not None else '',
-                'country': sheet_country,
-            })
-    return rows
-
-
-def _shops_with_latest_results():
-    """查询每家店铺最新结果行（用于重复 ASIN 扫描）。返回 shop_items 列表。"""
-    conditions = [
-        "r.module_type = 'SHOP_DATA_CRAWL'",
-        "t.module_type = 'SHOP_DATA_CRAWL'",
-        "TRIM(COALESCE(r.result_file_url, '')) <> ''",
-    ]
-    where_sql = ' AND '.join(conditions)
-    conn = get_db()
-    try:
-        with conn.cursor() as cur:
-            shop_key_sql = "TRIM(COALESCE(r.source_filename, ''))"
-            grouped_from_sql = (
-                ' FROM biz_file_result r '
-                'JOIN biz_file_task t ON t.id = r.task_id '
-                'LEFT JOIN biz_shop_data_crawl_daily_file df ON df.latest_result_id = r.id '
-                'LEFT JOIN users u ON u.id = r.user_id '
-                'WHERE ' + where_sql
-            )
-            cur.execute(
-                'SELECT ' + shop_key_sql + ' AS shop_name, MAX('
-                + _SHOP_DATA_CRAWL_LATEST_TIME_SQL + ') AS latest_created_at'
-                + grouped_from_sql +
-                ' GROUP BY ' + shop_key_sql +
-                ' ORDER BY latest_created_at DESC, shop_name ASC',
-            )
-            group_rows = cur.fetchall()
-            group_names = _shop_data_crawl_group_names(cur, group_rows)
-            result_rows_by_shop = {}
-            selected_shop_names = [row.get('shop_name') for row in group_rows]
-            if selected_shop_names:
-                placeholders = ','.join(['%s'] * len(selected_shop_names))
-                cur.execute(
-                    'SELECT ranked.* FROM (SELECT ' + _SHOP_DATA_CRAWL_ADMIN_COLUMNS +
-                    ', ROW_NUMBER() OVER (PARTITION BY ' + shop_key_sql +
-                    ' ORDER BY ' + _SHOP_DATA_CRAWL_LATEST_TIME_SQL
-                    + ' DESC, r.id DESC) AS shop_row_number '
-                    ' FROM biz_file_result r '
-                    'JOIN biz_file_task t ON t.id = r.task_id '
-                    'LEFT JOIN biz_shop_data_crawl_daily_file df ON df.latest_result_id = r.id '
-                    'LEFT JOIN users u ON u.id = r.user_id '
-                    'WHERE ' + where_sql +
-                    f' AND {shop_key_sql} IN ({placeholders})' +
-                    ') ranked WHERE ranked.shop_row_number <= 1 '
-                    'ORDER BY ranked.latest_file_updated_at DESC, ranked.result_id DESC',
-                    tuple(selected_shop_names),
-                )
-                for row in cur.fetchall():
-                    shop_key = _shop_data_crawl_shop_key(row.get('shop_name'))
-                    result_rows_by_shop.setdefault(shop_key, []).append(row)
-    finally:
-        conn.close()
-
-    # 逐店读取结果文件并解析
-    shop_items = []
-    for rows in result_rows_by_shop.values():
-        for row in rows:
-            result_id = int(row.get('result_id') or 0)
-            if result_id <= 0:
-                continue
-            try:
-                raw = _shop_data_crawl_fetch_result_bytes(row)
-                try:
-                    parsed = _shop_data_crawl_parse_workbook(
-                        load_workbook(io.BytesIO(raw), read_only=True, data_only=True))
-                except (InvalidFileException, KeyError, ValueError, zipfile.BadZipFile) as exc:
-                    current_app.logger.warning(
-                        '[shop-data-crawl] 解析结果文件失败 result_id=%s: %s', result_id, exc)
-                    continue
-                shop_items.append({
-                    'shop_name': row.get('shop_name') or '未命名',
-                    'group_name': _shop_data_crawl_group_name(group_names, row.get('shop_name')),
-                    'country_codes': _shop_data_crawl_country_codes_from_json(row.get('country_codes_json'))
-                                   or _shop_data_crawl_country_codes(row.get('request_json')),
-                    'rows': parsed,
-                })
-            except (requests.RequestException, ValueError) as exc:
-                current_app.logger.warning(
-                    '[shop-data-crawl] 拉取结果文件失败 result_id=%s: %s', result_id, exc)
-    return shop_items
-
-
-def _build_duplicate_scan_cache(shop_items, source='job'):
-    """由 shop_items 构建全量重复检查缓存：shops 概览 + 明细 items + 指标统计。
-
-    返回 {'shops': [...], 'items': [...], 'summary': {唯一ASIN/上架记录/重复ASIN…}}
-    items 内 occurrences 记录带 country（结果文件 sheet 映射的站点）。
-    """
-    asin_occurrences = {}
-    shop_agg = {}
-    for shop_item in shop_items:
-        shop_name = shop_item['shop_name'] or '未命名'
-        group_name = shop_item['group_name'] or ''
-        country_codes = shop_item['country_codes'] or []
-        shop_agg[shop_name] = {'group_name': group_name, 'country_codes': country_codes}
-        for row in shop_item['rows']:
-            asin = row['asin'].strip().upper()
-            if not asin:
-                continue
-            asin_occurrences.setdefault(asin, []).append({
-                'asin': asin,
-                'date': row['date'],
-                'price': row['price'],
-                'brand': row['brand'],
-                'shop_name': shop_name,
-                'group_name': group_name,
-                'country_codes': country_codes,
-                'country': row.get('country') or '',
-            })
-    items = []
-    total_records = 0
-    for asin, occurrences in asin_occurrences.items():
-        shop_count = len({item['shop_name'] for item in occurrences})
-        total_records += len(occurrences)
-        items.append({
-            'asin': asin,
-            'shop_count': shop_count,
-            'record_count': len(occurrences),
-            'occurrences': occurrences,
-        })
-    items.sort(key=lambda item: (-item['shop_count'], item['asin']))
-    repeated = sum(1 for item in items if item['shop_count'] >= 2)
-
-    shops = []
-    for shop_name, agg in sorted(shop_agg.items()):
-        shop_asin_set = {
-            occ['asin']
-            for occ_list in (oo for oo in asin_occurrences.values())
-            for occ in occ_list
-            if occ['shop_name'] == shop_name
-        }
-        shops.append({
-            'shop_name': shop_name,
-            'group_name': agg['group_name'],
-            'country_codes': agg['country_codes'],
-            'asin_count': len(shop_asin_set),
-            'record_count': sum(1 for occ_list in asin_occurrences.values() for occ in occ_list if occ['shop_name'] == shop_name),
-        })
-    shops.sort(key=lambda shop: (-shop['asin_count'], shop['shop_name']))
-
-    summary = {
-        'shop_count': len(shops),
-        'asin_total': len(items),
-        'record_total': total_records,
-        'duplicate_asin_total': repeated,
-        'duplicate_shop_count': len({occ['shop_name'] for item in items if item['shop_count'] >= 2 for occ in item['occurrences']}),
-        'site_count': len({occ['country'] for occ_list in asin_occurrences.values() for occ in occ_list if occ.get('country')}),
-        'asin_per_shop': round(float(total_records) / len(shops), 1) if shops else 0.0,
-        'source': source,
-    }
-    return {'shops': shops, 'items': items, 'summary': summary}
-
-
-def _build_duplicate_scan_items(shop_items):
-    """由 shop_items 聚合跨店重复 ASIN 完整结果（不含筛选，返回全量列表）。
-
-    保持旧接口语义（仅跨店重复），供导入模拟重分析等旧逻辑复用；
-    新页面走 _build_duplicate_scan_cache 全量缓存。
-    """
-    cache = _build_duplicate_scan_cache(shop_items)
-    return cache['items']
-
-
-def _run_duplicate_scan_job():
-    """执行一次全量重复检查扫描并落库（新格式：shops + items + summary）。返回 (ok, scanned_at, summary)。"""
-    global _duplicate_scan_running
-    if _duplicate_scan_running:
-        return False, '', '扫描进行中'
-    _duplicate_scan_running = True
-    try:
-        shop_items = _shops_with_latest_results()
-        cache = _build_duplicate_scan_cache(shop_items, source='job')
-        _save_duplicate_scan('SUCCESS', summary=cache['summary'], payload={
-            'shops': cache['shops'],
-            'items': cache['items'],
-        })
-        return True, datetime.now().strftime('%Y-%m-%d %H:%M:%S'), cache['summary']
-    except Exception as exc:
-        current_app.logger.exception('[shop-data-crawl] 重复检查定时扫描失败: %s', exc)
-        try:
-            _save_duplicate_scan('FAILED', error_text=str(exc))
-        except Exception:
-            current_app.logger.exception('[shop-data-crawl] 重复检查扫描失败记录落库失败')
-        return False, '', '执行失败：%s' % exc
-    finally:
-        _duplicate_scan_running = False
-
-
-def start_duplicate_scan_scheduler(app):
-    """每天凌晨 03:10 执行一次重复 ASIN 全量扫描（后台守护线程）。"""
-    _ensure_duplicate_scan_table()
-
-    def _loop():
-        while True:
-            now = datetime.now()
-            # 下一个 03:10（含今天，若已过则明天）
-            next_run = now.replace(hour=3, minute=10, second=0, microsecond=0)
-            if next_run <= now:
-                next_run = next_run.replace(day=next_run.day) + timedelta(days=1)
-            delay = (next_run - now).total_seconds()
-            app.logger.info('[shop-data-crawl] 重复ASIN定时扫描将于 %s 执行（%d 秒后）', next_run, int(delay))
-            time.sleep(delay)
-            try:
-                with app.app_context():
-                    ok, scanned_at, summary = _run_duplicate_scan_job()
-                app.logger.info('[shop-data-crawl] 重复ASIN定时扫描结束 ok=%s summary=%s', ok, summary)
-            except Exception as exc:
-                app.logger.exception('[shop-data-crawl] 重复ASIN定时扫描异常: %s', exc)
-
-    threading.Thread(target=_loop, daemon=True, name='duplicate-scan-scheduler').start()
-
-
-def _duplicate_check_filter_cache(cache, role, current_row):
-    """按角色数据范围裁剪重复检查缓存：超管返回全量，主管只返回自己组的店铺。
-
-    返回 (shops, items)：shops 为可见店铺概览；items 为裁剪 occurrences 后的明细
-    （裁剪后同一 ASIN 只剩 1 家店时也会保留 —— 展示完整台账，是否重复由 shop_count>=2 标记）。
-    """
-    visible_shops = _shop_data_managed_shop_names(role, current_row)
-    if visible_shops is None:
-        return cache.get('shops') or [], cache.get('items') or []
-    shops = []
-    for shop in (cache.get('shops') or []):
-        if _shop_data_crawl_shop_key(shop.get('shop_name')) in visible_shops:
-            shops.append(shop)
-    items = []
-    for item in (cache.get('items') or []):
-        occurrences = [
-            occ for occ in (item.get('occurrences') or [])
-            if _shop_data_crawl_shop_key(occ.get('shop_name')) in visible_shops
-        ]
-        if occurrences:
-            items.append({
-                'asin': item.get('asin'),
-                'shop_count': len({occ.get('shop_name') for occ in occurrences}),
-                'record_count': len(occurrences),
-                'occurrences': occurrences,
-            })
-    return shops, items
-
-
 @admin_api.route('/shop-data-crawl/duplicate-check-overview')
 @login_required
 def shop_data_crawl_duplicate_check_overview():
@@ -2307,58 +1835,17 @@ def shop_data_crawl_duplicate_check_overview():
     if denied:
         return denied
     try:
-        force = (request.args.get('force') or '').strip() in ('1', 'true', 'yes')
-        if force:
-            if not _duplicate_scan_lock.acquire(blocking=False):
-                return jsonify({'success': False, 'error': '扫描进行中，请稍后刷新'}), 409
-            try:
-                ok, scanned_at, summary = _run_duplicate_scan_job()
-                if not ok:
-                    return jsonify({'success': False, 'error': summary}), 500
-                cache = _latest_duplicate_scan()
-            finally:
-                _duplicate_scan_lock.release()
-        else:
-            cache = _latest_duplicate_scan()
-        if not cache:
-            return jsonify({
-                'success': True, 'pending': True,
-                'scanned_at': '', 'source': '',
-                'summary': {}, 'shops': [],
-            })
-        shops, items = _duplicate_check_filter_cache(cache, role, current_row)
-        asin_total = len(items)
-        record_total = sum(item.get('record_count') or 0 for item in items)
-        repeated = [item for item in items if item['shop_count'] >= 2]
-        shop_asin_totals = {}
-        duplicate_shops = set()
-        site_codes = set()
-        for item in items:
-            occs = item.get('occurrences') or []
-            for occ in occs:
-                shop_asin_totals[occ.get('shop_name')] = shop_asin_totals.get(occ.get('shop_name'), set())
-                shop_asin_totals[occ.get('shop_name')].add(item['asin'])
-                if item['shop_count'] >= 2:
-                    duplicate_shops.add(occ.get('shop_name'))
-                if occ.get('country'):
-                    site_codes.add(occ['country'])
-        summary = {
-            'shop_count': len(shops),
-            'asin_total': asin_total,
-            'record_total': record_total,
-            'duplicate_asin_total': len(repeated),
-            'duplicate_shop_count': len(duplicate_shops),
-            'site_count': len(site_codes),
-            'asin_per_shop': round(float(record_total) / len(shops), 1) if shops else 0.0,
-            'source': (cache.get('summary') or {}).get('source', ''),
-        }
-        return jsonify({
-            'success': True,
-            'pending': False,
-            'scanned_at': cache['scanned_at'],
-            'summary': summary,
-            'shops': shops,
-        })
+        force_raw = (request.args.get('force') or '').strip()
+        params = {}
+        if force_raw in ('1', 'true', 'yes'):
+            params['force'] = '1'
+        result, error_response, status = _proxy_permission_java(
+            'GET', '/api/admin/shop-data-crawl/duplicate-check-overview',
+            params=params, timeout=(10, 1800))
+        if error_response is not None:
+            return error_response, status
+        payload = result.get('data') or {}
+        return jsonify({'success': True, **payload})
     except Exception as exc:
         return _internal_error(exc)
 
@@ -2373,78 +1860,68 @@ def shop_data_crawl_duplicate_check_items():
     if denied:
         return denied
     try:
-        role, current_row = get_current_admin_role()
         page = max(1, int(request.args.get('page', 1)))
         page_size = min(100, max(10, int(request.args.get('page_size', 20))))
         view = (request.args.get('view') or 'monitor').strip().lower()
-        asin_filter = (request.args.get('asin') or '').strip().upper()
-        shop_name_filter = (request.args.get('shop_name') or request.args.get('shop') or '').strip()
-        country_filter = (request.args.get('country') or '').strip().upper()
-        site_filter = (request.args.get('site') or '').strip().upper()
-        date_from = (request.args.get('date_from') or '').strip()[:10]
-        date_to = (request.args.get('date_to') or '').strip()[:10]
-
-        cache = _latest_duplicate_scan()
-        if not cache:
-            return jsonify({
-                'success': True, 'pending': True,
-                'items': [], 'shops': [],
-                'total': 0, 'page': page, 'page_size': page_size,
-                'scanned_at': '',
-            })
-        shops, all_items = _duplicate_check_filter_cache(cache, role, current_row)
-        has_filter = bool(asin_filter or shop_name_filter or country_filter or site_filter or date_from or date_to)
-        matched = []
-        for item in all_items:
-            if asin_filter and asin_filter not in item['asin']:
-                continue
-            if view == 'monitor' and item['shop_count'] < 2:
-                continue
-            if not has_filter:
-                matched.append(item)
-                continue
-            hit = False
-            for occ in item['occurrences']:
-                if shop_name_filter and shop_name_filter.lower() not in (occ.get('shop_name') or '').lower() \
-                        and shop_name_filter.lower() not in (occ.get('group_name') or '').lower():
-                    continue
-                if country_filter and country_filter not in [c.upper() for c in (occ.get('country_codes') or [])]:
-                    continue
-                if site_filter and site_filter not in [c.upper() for c in [occ.get('country') or '']]:
-                    continue
-                row_date_key = _shop_data_date_key((occ.get('date') or '').strip())
-                if date_from and row_date_key and row_date_key < date_from:
-                    continue
-                if date_to and row_date_key and row_date_key > date_to:
-                    continue
-                hit = True
-                break
-            if hit:
-                matched.append(item)
-        total = len(matched)
-        offset = (page - 1) * page_size
-        return jsonify({
-            'success': True,
-            'pending': False,
-            'items': matched[offset:offset + page_size],
-            'shops': shops,
-            'total': total,
-            'page': page,
-            'page_size': page_size,
-            'scanned_at': cache['scanned_at'],
-        })
+        params = {'page': str(page), 'pageSize': str(page_size), 'view': view}
+        shop_name = (request.args.get('shop_name') or request.args.get('shop') or '').strip()
+        for key, value in (
+                ('asin', (request.args.get('asin') or '').strip()),
+                ('shopName', shop_name),
+                ('country', (request.args.get('country') or '').strip()),
+                ('site', (request.args.get('site') or '').strip()),
+                ('dateFrom', (request.args.get('date_from') or '').strip()),
+                ('dateTo', (request.args.get('date_to') or '').strip())):
+            if value:
+                params[key] = value
+        result, error_response, status = _proxy_permission_java(
+            'GET', '/api/admin/shop-data-crawl/duplicate-check-items', params=params)
+        if error_response is not None:
+            return error_response, status
+        payload = result.get('data') or {}
+        return jsonify({'success': True, **payload})
     except ValueError as exc:
         return jsonify({'success': False, 'error': str(exc)}), 400
     except Exception as exc:
         return _internal_error(exc)
 
 
-def _duplicate_check_effective_site(country, country_codes):
-    """导出用站点：优先记录级 country，其次店铺 country_codes 汇总。"""
-    if country:
-        return country.upper()
-    codes = [c.upper() for c in (country_codes or []) if c]
-    return '、'.join(codes) if codes else ''
+@admin_api.route('/shop-data-crawl/duplicate-check-detail')
+@login_required
+def shop_data_crawl_duplicate_check_detail():
+    """撞款详情（跨店重复 ASIN 卡片区）：分页返回 shop_count>=2 的 ASIN 明细。
+
+    筛选条件与矩阵接口一致（遵循当前筛选），排序：店铺数倒序 → 最早上架时间倒序 → ASIN 升序。
+    """
+    _, _, denied = _ensure_backend_menu_access('shop-data-crawl-tasks')
+    if not denied:
+        _, _, denied = _ensure_shop_data_crawl_data_access()
+    if denied:
+        return denied
+    try:
+        page = max(1, int(request.args.get('page', 1)))
+        page_size = min(24, max(1, int(request.args.get('page_size', 6))))
+        params = {'page': str(page), 'pageSize': str(page_size)}
+        shop_name = (request.args.get('shop_name') or request.args.get('shop') or '').strip()
+        for key, value in (
+                ('asin', (request.args.get('asin') or '').strip()),
+                ('shopName', shop_name),
+                ('country', (request.args.get('country') or '').strip()),
+                ('site', (request.args.get('site') or '').strip()),
+                ('dateFrom', (request.args.get('date_from') or '').strip()),
+                ('dateTo', (request.args.get('date_to') or '').strip())):
+            if value:
+                params[key] = value
+        result, error_response, status = _proxy_permission_java(
+            'GET', '/api/admin/shop-data-crawl/duplicate-check-detail', params=params)
+        if error_response is not None:
+            return error_response, status
+        payload = result.get('data') or {}
+        return jsonify({'success': True, **payload})
+    except ValueError as exc:
+        return jsonify({'success': False, 'error': str(exc)}), 400
+    except Exception as exc:
+        return _internal_error(exc)
 
 
 @admin_api.route('/shop-data-crawl/duplicate-check-export')
@@ -2459,161 +1936,61 @@ def shop_data_crawl_duplicate_check_export():
     try:
         role, current_row = get_current_admin_role()
         view = (request.args.get('view') or 'monitor').strip().lower()
-        asin_filter = (request.args.get('asin') or '').strip().upper()
-        shop_name_filter = (request.args.get('shop_name') or request.args.get('shop') or '').strip()
-        country_filter = (request.args.get('country') or '').strip().upper()
-        site_filter = (request.args.get('site') or '').strip().upper()
-        date_from = (request.args.get('date_from') or '').strip()[:10]
-        date_to = (request.args.get('date_to') or '').strip()[:10]
-
-        cache = _latest_duplicate_scan()
-        if not cache:
-            return jsonify({'success': False, 'error': '暂无扫描结果，请先点击「重新分析」'}), 400
-        shops, all_items = _duplicate_check_filter_cache(cache, role, current_row)
-        has_filter = bool(asin_filter or shop_name_filter or country_filter or site_filter or date_from or date_to)
-        # 展平为逐行记录（每行=一条上架记录），筛选逻辑与矩阵接口一致
-        flat = []
-        for item in all_items:
-            if asin_filter and asin_filter not in item['asin']:
-                continue
-            if view == 'monitor' and item['shop_count'] < 2:
-                continue
-            for occ in item['occurrences']:
-                if shop_name_filter and shop_name_filter.lower() not in (occ.get('shop_name') or '').lower() \
-                        and shop_name_filter.lower() not in (occ.get('group_name') or '').lower():
-                    continue
-                if country_filter and country_filter not in [c.upper() for c in (occ.get('country_codes') or [])]:
-                    continue
-                if site_filter and site_filter not in [c.upper() for c in [occ.get('country') or '']]:
-                    continue
-                row_date_key = _shop_data_date_key((occ.get('date') or '').strip())
-                if date_from and row_date_key and row_date_key < date_from:
-                    continue
-                if date_to and row_date_key and row_date_key > date_to:
-                    continue
-                flat.append({
-                    'asin': item['asin'],
-                    'shop_count': item['shop_count'],
-                    'shop_name': occ.get('shop_name') or '',
-                    'group_name': occ.get('group_name') or '',
-                    'country': _duplicate_check_effective_site(occ.get('country'), occ.get('country_codes')),
-                    'date': occ.get('date') or '',
-                    'price': occ.get('price') or '',
-                    'brand': occ.get('brand') or '',
-                })
-        flat.sort(key=lambda r: (-r['shop_count'], r['asin'], r['shop_name'], r['date']))
-        import csv
-        stream = io.StringIO()
-        writer = csv.writer(stream)
-        writer.writerow(['ASIN', '店铺数', '店铺', '分组', '站点', '上架时间', '价格', '品牌'])
-        for row in flat:
-            writer.writerow([row['asin'], row['shop_count'], row['shop_name'], row['group_name'],
-                             row['country'], row['date'], row['price'], row['brand']])
-        payload = ('' + stream.getvalue()).encode('utf-8')
-        response = Response(payload, mimetype='text/csv; charset=utf-8')
-        response.headers['Content-Disposition'] = 'attachment; filename="shop-data-duplicate-check.csv"'
-        response.headers['Cache-Control'] = 'no-store'
-        return response
-    except Exception as exc:
-        return _internal_error(exc)
-
-
-@admin_api.route('/shop-data-crawl/duplicate-asins')
-@login_required
-def shop_data_crawl_duplicate_asins():
-    """按当前筛选条件展示跨店铺重复的 ASIN 明细。
-
-    默认读取最近一次成功扫描的缓存结果（定时任务每天凌晨全量扫描），
-    页面点「重新分析」携带 force=1 触发一次实时扫描（锁防并发，重复触发返回 409）。
-    """
-    _, _, denied = _ensure_backend_menu_access('shop-data-crawl-tasks')
-    if not denied:
-        _, _, denied = _ensure_shop_data_crawl_data_access()
-    if denied:
-        return denied
-    try:
-        page = max(1, int(request.args.get('page', 1)))
-        page_size = min(100, max(10, int(request.args.get('page_size', 20))))
-        force = (request.args.get('force') or '').strip() in ('1', 'true', 'yes')
-        shop_name_filter = (request.args.get('shop_name') or request.args.get('shop') or '').strip()
-        country_filter = (request.args.get('country') or '').strip().upper()
-        asin_filter = (request.args.get('asin') or '').strip().upper()
-        date_from = (request.args.get('date_from') or '').strip()[:10]
-        date_to = (request.args.get('date_to') or '').strip()[:10]
-
-        if force:
-            # 实时扫描：持锁执行，避免与定时任务/其他请求并发
-            if not _duplicate_scan_lock.acquire(blocking=False):
-                return jsonify({'success': False, 'error': '扫描进行中，请稍后刷新'}), 409
+        operator_id = (current_row or {}).get('id')
+        if not operator_id and has_request_context():
+            operator_id = session.get('user_id')
+        params = {'view': view}
+        if operator_id:
+            params['operatorId'] = operator_id
+        shop_name = (request.args.get('shop_name') or request.args.get('shop') or '').strip()
+        for key, value in (
+                ('asin', (request.args.get('asin') or '').strip()),
+                ('shopName', shop_name),
+                ('country', (request.args.get('country') or '').strip()),
+                ('site', (request.args.get('site') or '').strip()),
+                ('dateFrom', (request.args.get('date_from') or '').strip()),
+                ('dateTo', (request.args.get('date_to') or '').strip())):
+            if value:
+                params[key] = value
+        url = f"{backend_java_base_url}/api/admin/shop-data-crawl/duplicate-check-export"
+        try:
+            resp = _get_backend_java_session().get(
+                url,
+                params=params,
+                headers={'X-Internal-Token': _resolve_internal_token()},
+                stream=True,
+                timeout=(10, 1800),
+            )
+        except requests.RequestException:
+            return jsonify({'success': False, 'error': 'backend-java 服务不可用'}), 502
+        if resp.status_code >= 400:
             try:
-                ok, scanned_at, summary = _run_duplicate_scan_job()
-                if not ok:
-                    return jsonify({'success': False, 'error': summary}), 500
-                cache = _latest_duplicate_scan()
+                data = resp.json()
+                error = data.get('message') or data.get('error') or '导出失败'
+            except ValueError:
+                error = '导出失败'
+            resp.close()
+            return jsonify({'success': False, 'error': error}), resp.status_code
+
+        headers = {}
+        disposition = resp.headers.get('Content-Disposition')
+        if disposition:
+            headers['Content-Disposition'] = disposition
+
+        def generate():
+            try:
+                for chunk in resp.iter_content(chunk_size=1024 * 1024):
+                    if chunk:
+                        yield chunk
             finally:
-                _duplicate_scan_lock.release()
-        else:
-            cache = _latest_duplicate_scan()
+                resp.close()
 
-        if not cache:
-            return jsonify({
-                'success': True,
-                'items': [],
-                'total': 0,
-                'page': page,
-                'page_size': page_size,
-                'analyzed_shop_count': 0,
-                'analyzed_result_count': 0,
-                'scanned_at': '',
-                'pending': True,
-            })
-
-        all_items = cache['items'] or []
-        # 旧接口只展示跨店重复：由全量缓存裁剪出 shop_count>=2 的 ASIN
-        all_items = [item for item in all_items if (item.get('shop_count') or 0) >= 2]
-        has_filter = bool(asin_filter or shop_name_filter or country_filter or date_from or date_to)
-        matched = []
-        for item in all_items:
-            if asin_filter and asin_filter not in item['asin']:
-                continue
-            if not has_filter:
-                matched.append(item)
-                continue
-            # 有筛选时：任一 occurrence 命中即保留该 ASIN（展示完整记录）
-            hit = False
-            for occ in item['occurrences']:
-                if shop_name_filter and shop_name_filter.lower() not in (occ.get('shop_name') or '').lower() \
-                        and shop_name_filter.lower() not in (occ.get('group_name') or '').lower():
-                    continue
-                if country_filter and country_filter not in [c.upper() for c in (occ.get('country_codes') or [])]:
-                    continue
-                row_date_key = _shop_data_date_key((occ.get('date') or '').strip())
-                if date_from and row_date_key and row_date_key < date_from:
-                    continue
-                if date_to and row_date_key and row_date_key > date_to:
-                    continue
-                hit = True
-                break
-            if hit:
-                matched.append(item)
-
-        total_details = len(matched)
-        offset = (page - 1) * page_size
-        paged_details = matched[offset:offset + page_size]
-
-        return jsonify({
-            'success': True,
-            'items': paged_details,
-            'total': total_details,
-            'page': page,
-            'page_size': page_size,
-            'analyzed_shop_count': cache['summary'].get('shop_count', 0) if cache.get('summary') else 0,
-            'analyzed_result_count': len(all_items),
-            'scanned_at': cache['scanned_at'],
-            'source': cache.get('summary', {}).get('source', ''),
-        })
-    except ValueError as exc:
-        return jsonify({'success': False, 'error': str(exc)}), 400
+        return Response(
+            stream_with_context(generate()),
+            status=resp.status_code,
+            headers=headers,
+            content_type=resp.headers.get('Content-Type', 'text/csv; charset=utf-8'),
+        )
     except Exception as exc:
         return _internal_error(exc)
 

backend/static/admin.js

@@ -1929,6 +1929,19 @@
             var shopDataDuplicateScannedAt = '';
             var shopDataDuplicateOverviewPending = false;
             var shopDataDuplicateExporting = false;
+            // 撞款详情卡片区（跨店重复 ASIN）独立分页
+            var shopDataDuplicateDetailPage = 1;
+            var shopDataDuplicateDetailPageSize = 6;
+            var shopDataDuplicateDetailItems = [];
+            var shopDataDuplicateDetailTotal = 0;
+            var shopDataDuplicateDetailLoading = false;
+
+            // 站点代码 → 中文国家名（撞款详情/抽屉展示用），未识别回退原值
+            var DUP_SITE_LABELS = { DE: '德国', UK: '英国', FR: '法国', IT: '意大利', ES: '西班牙' };
+            function dupSiteLabel(site) {
+                var key = String(site || '').trim().toUpperCase();
+                return DUP_SITE_LABELS[key] || String(site || '').trim();
+            }
 
             function buildShopDataDuplicateQuery(page) {
                 var params = new URLSearchParams();
@@ -2007,14 +2020,21 @@
                 }
                 var max = 0;
                 shops.forEach(function (shop) { if (shop.asin_count > max) max = shop.asin_count; });
+                // 新样式：双列网格，每格 = 店名 + 记录数 / 进度条 / N 个 ASIN（按 ASIN 数降序）
                 barsEl.innerHTML = shops.map(function (shop) {
-                    var width = max ? Math.max(3, Math.round(shop.asin_count / max * 100)) : 0;
-                    return '<div class="dup-chart-row">' +
-                        '<span class="dup-chart-name" title="' + escapeHtml(shop.shop_name) + '">' + escapeHtml(shop.shop_name) + '</span>' +
-                        '<span class="dup-chart-track"><span class="dup-chart-fill" style="width:' + width + '%"></span></span>' +
-                        '<span class="dup-chart-num">' + shop.asin_count + '</span></div>';
+                    var width = max ? Math.max(2, Math.round(shop.asin_count / max * 100)) : 0;
+                    var recordCount = Number(shop.record_count || 0);
+                    var asinCount = Number(shop.asin_count || 0);
+                    return '<div class="dup-dist-item">' +
+                        '<div class="dup-dist-item-head">' +
+                        '<span class="dup-dist-name" title="' + escapeHtml(shop.shop_name) + '">' + escapeHtml(shop.shop_name) + '</span>' +
+                        '<span class="dup-dist-record">' + recordCount.toLocaleString() + '</span>' +
+                        '</div>' +
+                        '<div class="dup-dist-track"><span class="dup-dist-fill" style="width:' + width + '%"></span></div>' +
+                        '<div class="dup-dist-asin">' + asinCount.toLocaleString() + ' 个 ASIN</div>' +
+                        '</div>';
                 }).join('');
-                noteEl.textContent = '共 ' + shops.length + ' 家店铺 · 按 ASIN 数量排序';
+                noteEl.textContent = '各店铺在本批站点中的上架记录量 · 共 ' + shops.length + ' 家店铺';
             }
 
             function shopDataDuplicateCellCount(item, shopName) {
@@ -2070,24 +2090,25 @@
                 if (button) openShopDataDuplicateDrawer(button.dataset.openAsinDetail);
             }
 
-            // 撞款详情卡片区：同一 ASIN 在多条店铺的上架明细（仅跨店铺重复，按店铺数倒序）
+            // 站点徽章：中文国家（未识别回退原值）
+            function dupSiteBadge(site) {
+                return '<span class="dup-site-badge dup-site-' + escapeHtml(String(site || '-').toUpperCase()) + '">'
+                    + escapeHtml(dupSiteLabel(site)) + '</span>';
+            }
+
+            // 撞款详情卡片区：同一 ASIN 在多条店铺的上架明细（独立分页，仅跨店铺重复）
             function renderShopDataDuplicateDetailCards() {
                 var block = document.getElementById('dupCheckDetailBlock');
                 var cardsEl = document.getElementById('dupCheckDetailCards');
                 if (!block || !cardsEl) return;
-                var repeated = (shopDataDuplicateItems || []).filter(function (item) {
-                    return Number(item.shop_count) >= 2;
-                }).slice().sort(function (a, b) {
-                    return (Number(b.shop_count) - Number(a.shop_count)) || dupTimeRank(b.first_date || '') - dupTimeRank(a.first_date || '');
-                });
-                if (!repeated.length) {
+                if (!shopDataDuplicateDetailItems.length) {
                     block.style.display = 'none';
                     cardsEl.innerHTML = '';
                     return;
                 }
                 block.style.display = '';
-                cardsEl.innerHTML = repeated.map(function (item) {
-                    // 按店铺分组：名称 + 次数 + 站点 + 上架时间（倒序）
+                cardsEl.innerHTML = shopDataDuplicateDetailItems.map(function (item) {
+                    // 按店铺分组：名称 + 次数 + 国家 + 上架时间（倒序）
                     var shopsMap = {};
                     (item.occurrences || []).forEach(function (occ) {
                         var key = occ.shop_name || '-';
@@ -2103,7 +2124,7 @@
                         info.times.sort(function (a, b) { return (a < b ? 1 : (a > b ? -1 : 0)); });
                         info.times = Array.from(new Set(info.times));
                         var rowSites = Object.keys(info.sites).sort().map(function (site) {
-                            return '<span class="dup-check-site">' + escapeHtml(site) + '</span>';
+                            return dupSiteBadge(site);
                         }).join('');
                         return '<tr>' +
                             '<td class="dup-shop">' + escapeHtml(info.shop) + '<span class="dup-detail-count">' + info.count + ' 次</span></td>' +
@@ -2119,70 +2140,130 @@
                         '<button class="btn btn-sm btn-secondary dup-detail-view-btn" type="button" data-open-asin-detail="' + escapeHtml(item.asin) + '">查看明细</button>' +
                         '</div>' +
                         '<table class="duplicate-asin-table dup-card-table"><thead>' +
-                        '<tr><th>店铺</th><th>站点</th><th>上架时间</th></tr></thead>' +
+                        '<tr><th>店铺</th><th>国家</th><th>上架时间</th></tr></thead>' +
                         '<tbody>' + rows + '</tbody></table>' +
                         '</div>';
                 }).join('');
             }
 
+            // 撞款详情分页加载：筛选/重置时回到第 1 页，矩阵翻页不影响详情页
+            function loadShopDataDuplicateDetail(page) {
+                if (shopDataDuplicateDetailLoading) return;
+                shopDataDuplicateDetailLoading = true;
+                var block = document.getElementById('dupCheckDetailBlock');
+                var cardsEl = document.getElementById('dupCheckDetailCards');
+                var params = new URLSearchParams();
+                params.set('page', String(page || 1));
+                params.set('page_size', String(shopDataDuplicateDetailPageSize));
+                var values = {
+                    asin: document.getElementById('shopDataDupFilterAsin').value.trim(),
+                    shop_name: document.getElementById('shopDataDupFilterShop').value.trim(),
+                    country: document.getElementById('shopDataDupFilterCountry').value.trim(),
+                    site: document.getElementById('shopDataDupFilterSite').value.trim(),
+                    date_from: document.getElementById('shopDataDupFilterDateFrom').value,
+                    date_to: document.getElementById('shopDataDupFilterDateTo').value
+                };
+                Object.keys(values).forEach(function (key) {
+                    if (values[key]) params.set(key, values[key]);
+                });
+                cardsEl.innerHTML = '<div class="shop-data-empty-hint">加载中...</div>';
+                fetch('/api/admin/shop-data-crawl/duplicate-check-detail?' + params.toString())
+                    .then(function (response) { return response.json(); })
+                    .then(function (res) {
+                        if (!res.success) throw new Error(res.error || '加载失败');
+                        shopDataDuplicateDetailItems = res.items || [];
+                        shopDataDuplicateDetailTotal = Number(res.total) || 0;
+                        shopDataDuplicateDetailPage = res.page || 1;
+                        renderShopDataDuplicateDetailCards();
+                        if (block.style.display !== 'none') {
+                            renderPagination('dupCheckDetailPagination', shopDataDuplicateDetailTotal,
+                                shopDataDuplicateDetailPage, shopDataDuplicateDetailPageSize,
+                                loadShopDataDuplicateDetail);
+                        }
+                    })
+                    .catch(function (error) {
+                        shopDataDuplicateDetailItems = [];
+                        shopDataDuplicateDetailTotal = 0;
+                        renderShopDataDuplicateDetailCards();
+                    })
+                    .finally(function () {
+                        shopDataDuplicateDetailLoading = false;
+                    });
+            }
+
+            // 抽屉徽章：基础滴状标签（按上下文附加不同配色类）
+            function dupDrawerBadge(text, cls) {
+                return '<span class="dup-drawer-badge' + (cls ? ' ' + cls : '') + '">' + escapeHtml(text) + '</span>';
+            }
+
+            // 图3 样式抽屉：ASIN + 店在售徽章 / 品牌行 / 彩色徽章组 / 按时间升序明细 + 次数列
             function openShopDataDuplicateDrawer(asin) {
                 var item = null;
-                (shopDataDuplicateItems || []).forEach(function (it) { if (it.asin === asin) item = it; });
+                (shopDataDuplicateDetailItems || []).forEach(function (it) { if (it.asin === asin) item = it; });
+                if (!item) {
+                    (shopDataDuplicateItems || []).forEach(function (it) { if (it.asin === asin) item = it; });
+                }
                 if (!item) return;
-                var occurrences = item.occurrences || [];
-                var brand = '', dateMin = '', dateMax = '', sites = {}, prices = [];
-                var shopsMap = {};
-                occurrences.forEach(function (occ) {
-                    if (!brand && occ.brand) brand = occ.brand;
-                    var d = normalizeDuplicateTime(occ.date);
-                    if (d) {
-                        if (!dateMin || d < dateMin) dateMin = d;
-                        if (!dateMax || d > dateMax) dateMax = d;
-                    }
-                    if (occ.country) sites[occ.country] = true;
-                    if (occ.price && prices.indexOf(occ.price) < 0) prices.push(occ.price);
-                    var shopKey = occ.shop_name || '-';
-                    if (!shopsMap[shopKey]) {
-                        shopsMap[shopKey] = { shop: occ.shop_name || '-', group: occ.group_name || '', sites: {}, times: {}, price: '', count: 0 };
-                    }
-                    var info = shopsMap[shopKey];
-                    info.count++;
-                    if (occ.country) info.sites[occ.country] = true;
-                    if (d) info.times[d] = true;
-                    if (occ.price && !info.price) info.price = occ.price;
+                var occurrences = (item.occurrences || []).slice();
+                var brand = item.brand || '';
+                // 上架时间归一化并升序排列（按时间正序展示）
+                occurrences.forEach(function (occ) { occ._dupTime = normalizeDuplicateTime(occ.date); });
+                occurrences.sort(function (a, b) {
+                    var ta = a._dupTime || '', tb = b._dupTime || '';
+                    if (ta === tb) return 0;
+                    return ta < tb ? -1 : 1;
                 });
-                var dateRange = dateMin && dateMax ? (dateMin === dateMax ? dateMin : dateMin + ' ~ ' + dateMax) : '-';
-                var priceRange = prices.length ? prices.slice(0, 4).join(' / ') + (prices.length > 4 ? ' 等' : '') : '-';
-                var siteBadges = Object.keys(sites).sort().map(function (site) {
-                    return '<span class="dup-check-site">' + escapeHtml(site) + '</span>';
-                }).join('');
-                var rows = Object.keys(shopsMap).sort().map(function (key) {
-                    var info = shopsMap[key];
-                    var times = Object.keys(info.times).sort().reverse();
-                    var rowSites = Object.keys(info.sites).sort().map(function (site) {
-                        return '<span class="dup-check-site">' + escapeHtml(site) + '</span>';
-                    }).join('');
+                var sites = {}, firstDate = '';
+                occurrences.forEach(function (occ) {
+                    if (occ.country) sites[occ.country] = true;
+                    if (!brand && occ.brand) brand = occ.brand;
+                    var t = occ._dupTime;
+                    if (t && (!firstDate || t < firstDate)) firstDate = t;
+                });
+                // 店铺 + 国家两级聚合：次数 = 该店铺在该国家的上架记录数
+                var countsMap = {};
+                occurrences.forEach(function (occ) {
+                    var shopKey = occ.shop_name || '-';
+                    var siteKey = (occ.country || '').trim().toUpperCase() || '-';
+                    var key = shopKey + '|||' + siteKey;
+                    countsMap[key] = (countsMap[key] || 0) + 1;
+                });
+                var rows = occurrences.map(function (occ) {
+                    var shopKey = occ.shop_name || '-';
+                    var siteKey = (occ.country || '').trim().toUpperCase() || '-';
+                    var times = [];
+                    if (occ._dupTime && occ._dupTime.length >= 16) times.push(occ._dupTime.slice(0, 16));
+                    else if (normalizeDuplicateTime(occ.date)) times.push(normalizeDuplicateTime(occ.date));
+                    else occ.date || '';
+                    var count = countsMap[shopKey + '|||' + siteKey] || 0;
+                    var siteBadge = siteKey === '-' ? '<span class="dup-site-badge dup-site-NA">-</span>' : dupSiteBadge(siteKey);
                     return '<tr>' +
-                        '<td><span class="dup-asin-cell">' + escapeHtml(info.shop) + '</span></td>' +
-                        '<td>' + escapeHtml(info.group || '-') + '</td>' +
-                        '<td>' + (rowSites || '-') + '</td>' +
-                        '<td class="dup-date">' + times.map(escapeHtml).join('、') + '</td>' +
-                        '<td class="dup-date">' + escapeHtml(info.price || '-') + '</td>' +
-                        '<td>' + info.count + '</td></tr>';
+                        '<td><span class="dup-asin-cell">' + escapeHtml(shopKey) + '</span></td>' +
+                        '<td>' + siteBadge + '</td>' +
+                        '<td class="dup-date">' + escapeHtml(times.join('')) + '</td>' +
+                        '<td>' + count + '</td></tr>';
                 }).join('');
+                // 顶部「N 店在售」红色徽章
+                var shopCount = Number(item.shop_count || 0);
+                var recordCount = Number(item.record_count || 0);
+                var headerBadges =
+                    dupDrawerBadge(shopCount + ' 店在售', 'dup-drawer-badge-danger') +
+                    dupDrawerBadge(shopCount + ' 家店铺', 'dup-drawer-badge-blue') +
+                    Object.keys(sites).sort().map(function (site) {
+                        return dupDrawerBadge(dupSiteLabel(site), 'dup-site-' + site.toUpperCase());
+                    }).join('') +
+                    dupDrawerBadge(recordCount + ' 次上架', 'dup-drawer-badge-green') +
+                    (firstDate ? dupDrawerBadge('最早上架 ' + firstDate.slice(0, 16), 'dup-drawer-badge-cyan') : '');
                 document.getElementById('dupCheckDrawerAsin').textContent = item.asin;
-                document.getElementById('dupCheckDrawerSubtitle').textContent =
-                    item.shop_count + ' 家店铺 · ' + item.record_count + ' 条上架记录';
+                document.getElementById('dupCheckDrawerAsin').className = 'dup-drawer-asin';
+                var subtitleEl = document.getElementById('dupCheckDrawerSubtitle');
+                subtitleEl.className = 'dup-drawer-subtitle dup-drawer-inline-badges';
+                subtitleEl.innerHTML = headerBadges;
                 document.getElementById('dupCheckDrawerBody').innerHTML =
-                    '<dl class="dup-check-drawer-meta">' +
-                    '<dt>品牌</dt><dd>' + escapeHtml(brand || '-') + '</dd>' +
-                    '<dt>价格</dt><dd>' + escapeHtml(priceRange) + '</dd>' +
-                    '<dt>日期范围</dt><dd>' + escapeHtml(dateRange) + '</dd>' +
-                    '<dt>站点</dt><dd>' + (siteBadges || '-') + '</dd></dl>' +
-                    '<h4 style="margin:14px 0 6px;font-size:13.5px;">店铺 / 站点 / 上架时间 / 次数</h4>' +
+                    '<div class="dup-drawer-brand-line">品牌：' + escapeHtml(brand || '-') + '</div>' +
                     '<div class="table-scroll"><table class="dup-check-drawer-table">' +
-                    '<thead><tr><th>店铺</th><th>分组</th><th>站点</th><th>上架时间</th><th>价格</th><th>次数</th></tr></thead>' +
-                    '<tbody>' + rows + '</tbody></table></div>';
+                    '<thead><tr><th>店铺</th><th>国家</th><th>上架时间（按时间升序）</th><th>次数</th></tr></thead>' +
+                    '<tbody>' + (rows || '<tr><td colspan="4" class="shop-data-empty-hint">暂无明细</td></tr>') + '</tbody></table></div>';
                 document.getElementById('dupCheckDrawerMask').classList.add('show');
             }
 
@@ -2246,7 +2327,7 @@
                             + (shopDataDuplicateScannedAt ? ' · 扫描时间 ' + shopDataDuplicateScannedAt
                                 : (shopDataDuplicateOverviewPending ? ' · 尚无扫描结果（点击「重新分析」立即扫描）' : ''));
                         renderShopDataDuplicateMatrix();
-                        renderShopDataDuplicateDetailCards();
+                        loadShopDataDuplicateDetail(shopDataDuplicateDetailPage || 1);
                         renderPagination('shopDataDuplicatePagination', shopDataDuplicateTotal,
                             shopDataDuplicatePage, shopDataDuplicatePageSize, loadShopDataDuplicateCheckItems);
                     })
@@ -2255,7 +2336,7 @@
                         shopDataDuplicateTotal = 0;
                         list.innerHTML = '<div class="shop-data-empty-hint">加载失败：' + escapeHtml(error.message || '') + '</div>';
                         document.getElementById('shopDataDuplicateTotal').textContent = '';
-                        renderShopDataDuplicateDetailCards();
+                        loadShopDataDuplicateDetail(1);
                     })
                     .finally(function () {
                         shopDataDuplicateLoading = false;
@@ -2274,6 +2355,7 @@
                 monitorTab.setAttribute('aria-selected', monitorActive ? 'true' : 'false');
                 allTab.classList.toggle('active', !monitorActive);
                 allTab.setAttribute('aria-selected', !monitorActive ? 'true' : 'false');
+                shopDataDuplicateDetailPage = 1;
                 loadShopDataDuplicateCheckItems(1);
             }
 
@@ -2503,10 +2585,14 @@
                 loadShopDataCrawlTasks(1);
             };
             document.getElementById('btnRefreshShopDataDuplicates').onclick = function () { loadShopDataDuplicateCheckOverview(true); };
-            document.getElementById('btnFilterShopDataDuplicates').onclick = function () { loadShopDataDuplicateCheckItems(1); };
+            document.getElementById('btnFilterShopDataDuplicates').onclick = function () {
+                shopDataDuplicateDetailPage = 1;
+                loadShopDataDuplicateCheckItems(1);
+            };
             document.getElementById('btnResetShopDataDuplicates').onclick = function () {
                 ['shopDataDupFilterAsin', 'shopDataDupFilterShop', 'shopDataDupFilterCountry', 'shopDataDupFilterSite', 'shopDataDupFilterDateFrom', 'shopDataDupFilterDateTo']
                     .forEach(function (id) { document.getElementById(id).value = ''; });
+                shopDataDuplicateDetailPage = 1;
                 loadShopDataDuplicateCheckItems(1);
             };
             document.getElementById('dupCheckTabMonitor').onclick = function () { switchDupCheckView('monitor'); };

backend/tests/test_admin_shop_data_duplicate_asins.py

@@ -1,307 +0,0 @@
-"""重复 ASIN 分析接口单元测试：模拟数据库行与结果文件，验证跨店铺重复聚合逻辑。"""
-import sys
-import unittest
-from datetime import datetime
-from io import BytesIO
-from pathlib import Path
-from unittest.mock import patch
-
-from openpyxl import Workbook
-from flask import Flask
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
-from blueprints import admin_api
-
-
-def _make_workbook(rows_by_sheet):
-    """构造结果 Workbook：rows_by_sheet = {sheet名: [(日期, ASIN, 价格, 品牌), ...]}"""
-    wb = Workbook()
-    wb.remove(wb.active)
-    for sheet_name, rows in rows_by_sheet.items():
-        ws = wb.create_sheet(sheet_name)
-        ws.append(['日期', 'ASIN', '商品图片', '库存销量', '销售排名',
-                   '页面浏览量', '售出件数', '价格', '推荐报价', '品牌'])
-        for date, asin, price, brand in rows:
-            row = [date, asin, '', '', '', '', '', price, '', brand]
-            ws.append(row)
-    return wb
-
-
-class ShopDataDuplicateAsinTest(unittest.TestCase):
-    def setUp(self):
-        self.app = Flask(__name__)
-        self.app.config['SECRET_KEY'] = 'test-secret'
-        self.group_rows = [
-            {'shop_name': 'Shop A', 'latest_created_at': datetime(2026, 8, 31, 1, 15, 1)},
-            {'shop_name': 'Shop B', 'latest_created_at': datetime(2026, 8, 31, 1, 15, 2)},
-            {'shop_name': 'Shop C', 'latest_created_at': datetime(2026, 8, 31, 1, 15, 3)},
-        ]
-        # 每家店一个结果文件：Shop A 与 Shop B 共享 ASIN1；Shop C 单独 ASIN3
-        # 国家码按店铺实际 sheet：A=UK+DE、B=仅UK、C=FR
-        self.shop_country = {
-            'Shop A': '["UK","DE"]',
-            'Shop B': '["UK"]',
-            'Shop C': '["FR"]',
-        }
-        self.shop_files = {
-            'Shop A': _make_workbook({
-                '英国': [('2026-08-30', 'B0ABC111', 'GBP 9.99', 'BrandA'),
-                         ('2026-08-30', 'B0UNIQUE1', 'GBP 5.00', 'BrandA')],
-                '德国': [('2026-08-30', 'B0ABC111', 'EUR 10.99', 'BrandA')],
-            }),
-            'Shop B': _make_workbook({
-                '英国': [('2026-08-31', 'B0ABC111', 'GBP 8.50', 'BrandA'),
-                         ('2026-08-31', 'B0ABC222', 'GBP 12.00', 'BrandB')],
-            }),
-            'Shop C': _make_workbook({
-                '法国': [('2026-08-29', 'B0ABC333', 'EUR 7.50', 'BrandC')],
-            }),
-        }
-
-    def _result_row(self, result_id, shop_name, country_codes_json=None):
-        return {
-            'result_id': result_id,
-            'task_id': result_id + 100,
-            'user_id': 7,
-            'shop_name': shop_name,
-            'shop_id': shop_name.lower(),
-            'task_no': f'task-{result_id}',
-            'task_status': 'SUCCESS',
-            'result_success': 1,
-            'result_error': None,
-            'task_error': None,
-            'file_error': None,
-            'result_file_url': f'object-{result_id}',
-            'result_filename': f'result-{result_id}.xlsx',
-            'result_file_size': 10,
-            'row_count': 2,
-            'request_json': '{}',
-            'country_codes_json': country_codes_json,
-            'created_at': '2026-08-31T01:15:00',
-            'updated_at': '2026-08-31T01:15:00',
-            'finished_at': '2026-08-31T01:15:00',
-            'latest_file_updated_at': '2026-08-31T01:15:00',
-            'file_job_id': None,
-            'file_status': 'SUCCESS',
-            'username': 'operator',
-        }
-
-    class _FakeCursor:
-        def __init__(self, group_rows, result_rows):
-            self.group_rows = group_rows
-            self.result_rows = result_rows
-            self.kind = None
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, *_args):
-            return False
-
-        def execute(self, sql, params=()):
-            if 'COUNT(*) AS total' in sql:
-                self.kind = 'count'
-            elif 'AS latest_created_at' in sql and 'GROUP BY' in sql:
-                self.kind = 'groups'
-            elif 'GROUP_CONCAT' in sql:
-                self.kind = 'group_names'
-            else:
-                self.kind = 'results'
-
-        def fetchone(self):
-            return {'total': len(self.group_rows)}
-
-        def fetchall(self):
-            if self.kind == 'groups':
-                return self.group_rows
-            if self.kind == 'group_names':
-                return [{'shop_name': row['shop_name'], 'group_name': 'Group-' + row['shop_name']}
-                        for row in self.group_rows]
-            return self.result_rows
-
-    class _FakeConnection:
-        def __init__(self, cursor):
-            self.cursor_value = cursor
-
-        def cursor(self):
-            return self.cursor_value
-
-        def close(self):
-            pass
-
-    def _make_workbook_bytes(self, shop_name):
-        stream = BytesIO()
-        self.shop_files[shop_name].save(stream)
-        return stream.getvalue()
-
-    def _build_cache(self):
-        """构造与旧扫描一致的缓存：3 家店铺、跨店重复 B0ABC111。"""
-        return {
-            'scanned_at': '2026-09-03 03:10:00',
-            'summary': {'shop_count': 3, 'total': 1},
-            'items': [{
-                'asin': 'B0ABC111',
-                'shop_count': 2,
-                'record_count': 3,
-                'occurrences': [
-                    {'asin': 'B0ABC111', 'date': '2026-08-30', 'price': 'GBP 9.99', 'brand': 'BrandA',
-                     'shop_name': 'Shop A', 'group_name': 'Group-Shop A', 'country_codes': ['UK', 'DE']},
-                    {'asin': 'B0ABC111', 'date': '2026-08-30', 'price': 'EUR 10.99', 'brand': 'BrandA',
-                     'shop_name': 'Shop A', 'group_name': 'Group-Shop A', 'country_codes': ['DE']},
-                    {'asin': 'B0ABC111', 'date': '2026-08-31', 'price': 'GBP 8.50', 'brand': 'BrandA',
-                     'shop_name': 'Shop B', 'group_name': 'Group-Shop B', 'country_codes': ['UK']},
-                ],
-            }],
-        }
-
-    def _run_request(self, query='', cache=None):
-        # 界面默认读缓存；force 走实时扫描（需 mock 扫描核心）
-        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-asins?' + query):
-            with patch('utils.auth.session', {'user_id': 1}), \
-                    patch('utils.auth.is_session_user_valid', return_value=True), \
-                    patch.object(admin_api, '_latest_duplicate_scan', return_value=cache), \
-                    patch.object(admin_api, '_ensure_backend_menu_access', return_value=(None, None, None)), \
-                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=(None, None, None)):
-                return admin_api.shop_data_crawl_duplicate_asins()
-
-    def test_detects_duplicate_asins_across_shops(self):
-        response = self._run_request('page=1&page_size=10', cache=self._build_cache())
-        self.assertEqual(response.status_code, 200)
-        body = response.get_json()
-        self.assertTrue(body['success'])
-        self.assertEqual(body['total'], 1)  # 只有 B0ABC111 跨店重复
-        self.assertEqual(body['analyzed_shop_count'], 3)
-        item = body['items'][0]
-        self.assertEqual(item['asin'], 'B0ABC111')
-        self.assertEqual(item['shop_count'], 2)
-        self.assertEqual(item['record_count'], 3)  # ShopA 英国/德国 + ShopB 英国 共 3 条
-        shops = {occ['shop_name'] for occ in item['occurrences']}
-        self.assertEqual(shops, {'Shop A', 'Shop B'})
-        # 国家与日期从行/表头正确映射
-        shop_a = next(occ for occ in item['occurrences'] if occ['shop_name'] == 'Shop A')
-        self.assertIn('UK', shop_a['country_codes'])
-        self.assertEqual(shop_a['date'], '2026-08-30')
-        self.assertEqual(body['scanned_at'], '2026-09-03 03:10:00')
-
-    def test_no_cache_returns_pending_empty(self):
-        # 无缓存时（定时任务尚未执行）：返回空 + pending 提示
-        response = self._run_request('page=1&page_size=10', cache=None)
-        body = response.get_json()
-        self.assertTrue(body['success'])
-        self.assertEqual(body['total'], 0)
-        self.assertEqual(body['items'], [])
-        self.assertTrue(body['pending'])
-
-    def test_cache_filters_match_live_semantics(self):
-        cache = self._build_cache()
-        # 店铺过滤 Shop B：命中 → 完整记录
-        response = self._run_request('page=1&page_size=10&shop_name=Shop+B', cache=cache)
-        body = response.get_json()
-        self.assertEqual(body['total'], 1)
-        self.assertEqual(body['items'][0]['asin'], 'B0ABC111')
-        # 日期范围 08-31 命中
-        response = self._run_request('page=1&page_size=10&date_from=2026-08-31&date_to=2026-08-31', cache=cache)
-        body = response.get_json()
-        self.assertEqual(body['total'], 1)
-        # 国家 FR 无命中
-        response = self._run_request('page=1&page_size=10&country=FR', cache=cache)
-        body = response.get_json()
-        self.assertEqual(body['total'], 0)
-
-    def test_force_runs_live_scan(self):
-        # force=1 触发实时扫描并保存缓存后返回
-        cursor = self._FakeCursor(
-            self.group_rows,
-            [self._result_row(i + 1, row['shop_name'], self.shop_country[row['shop_name']])
-             for i, row in enumerate(self.group_rows)],
-        )
-        connection = self._FakeConnection(cursor)
-        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-asins?page=1&page_size=10&force=1'):
-            with patch('utils.auth.session', {'user_id': 1}), \
-                    patch('utils.auth.is_session_user_valid', return_value=True), \
-                    patch.object(admin_api, 'get_db', return_value=connection), \
-                    patch.object(admin_api, '_ensure_backend_menu_access', return_value=(None, None, None)), \
-                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=(None, None, None)), \
-                    patch.object(admin_api, '_save_duplicate_scan', return_value=1), \
-                    patch.object(admin_api, '_latest_duplicate_scan',
-                                 return_value=self._build_cache()), \
-                    patch.object(admin_api, '_shop_data_crawl_fetch_result_bytes',
-                                 side_effect=lambda row: self._make_workbook_bytes(row['shop_name'])):
-                response = admin_api.shop_data_crawl_duplicate_asins()
-        self.assertIsNotNone(response)
-        body = response.get_json()
-        self.assertTrue(body['success'])
-        self.assertEqual(body['total'], 1)
-        self.assertEqual(body['items'][0]['asin'], 'B0ABC111')
-
-    def test_force_conflict_when_lock_held(self):
-        # 锁被占（定时任务/他请求在扫）时 force 返回 409
-        cursor = self._FakeCursor(self.group_rows[:0], [])
-        connection = self._FakeConnection(cursor)
-        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-asins?page=1&page_size=10&force=1'):
-            with patch('utils.auth.session', {'user_id': 1}), \
-                    patch('utils.auth.is_session_user_valid', return_value=True), \
-                    patch.object(admin_api, 'get_db', return_value=connection), \
-                    patch.object(admin_api, '_ensure_backend_menu_access', return_value=(None, None, None)), \
-                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=(None, None, None)), \
-                    patch.object(admin_api, '_duplicate_scan_lock'):
-                admin_api._duplicate_scan_lock.acquire.return_value = False
-                response = admin_api.shop_data_crawl_duplicate_asins()
-        # 409 返回 (jsonify, status) tuple
-        self.assertEqual(response[1], 409)
-
-    def test_latest_duplicate_scan_deserializes_json_columns(self):
-        """真实读库：summary_json / payload_json 为 JSON 字符串，需反序列化为 dict/list。"""
-        class _ScanCursor(self._FakeCursor):
-            def __init__(self):
-                self.kind = None
-
-            def execute(self, sql, params=()):
-                self.kind = 'scan'
-
-            def fetchone(self):
-                return {
-                    'id': 9,
-                    'summary_json': '{"shop_count": 3, "total": 1, "source": "import"}',
-                    'payload_json': '[{"asin": "B0ABC111", "shop_count": 2}]',
-                    'created_at': datetime(2026, 9, 3, 13, 35, 25),
-                }
-
-        class _ScanConnection(self._FakeConnection):
-            def cursor(self):
-                return _ScanCursor()
-
-        with patch.object(admin_api, 'get_db', return_value=_ScanConnection(None)):
-            cache = admin_api._latest_duplicate_scan()
-        self.assertIsNotNone(cache)
-        self.assertEqual(cache['summary']['shop_count'], 3)
-        self.assertEqual(cache['summary']['source'], 'import')
-        self.assertEqual(cache['items'][0]['asin'], 'B0ABC111')
-        self.assertEqual(cache['scanned_at'], '2026-09-03 13:35:25')
-
-    def test_parse_workbook_skips_unknown_sheets(self):
-        wb = _make_workbook({'英国': [('2026-08-30', 'B0TEST01', 'GBP 1.00', '')]})
-        # 手工追加一个无标准表头的 sheet，模拟未知表
-        ws = wb.create_sheet('未知表')
-        ws.append(['随便', '某列'])
-        ws.append(['2026-08-30', 'B0NOHEADER'])
-        rows = admin_api._shop_data_crawl_parse_workbook(wb)
-        self.assertEqual([row['asin'] for row in rows], ['B0TEST01'])
-
-    def test_date_key_normalizes_chinese_datetime(self):
-        # 中文日期归一化为 ISO 供范围比较
-        cases = {
-            '2026年8月18日 上午4:34': '2026-08-18',
-            '2026年8月19日 05:48': '2026-08-19',
-            '2026-08-19': '2026-08-19',
-            '2026.8.19': '2026-08-19',
-            '2026/8/19': '2026-08-19',
-            '': '',
-            'abc': 'abc',  # 无法识别时原样返回，范围比较自然失败
-        }
-        for raw, expected in cases.items():
-            self.assertEqual(admin_api._shop_data_date_key(raw), expected)
-
-
-if __name__ == '__main__':
-    unittest.main()

backend/tests/test_admin_shop_data_duplicate_check.py

@@ -1,4 +1,11 @@
-"""店铺数据重复检查接口单元测试：全量缓存格式、矩阵分页、主管/超管数据范围过滤。"""
+"""店铺数据重复检查接口（撞款 duplicate-check）转发契约测试。
+
+四个端点已迁移到 Java（/api/admin/shop-data-crawl/duplicate-check-{overview,items,detail,export}），
+Flask 侧仅做：本地菜单/数据权限预检 → 带 operatorId + X-Internal-Token 转发 Java →
+把 Java ApiResponse.data 原样透传并加 success 包装。本文件验证透传形状、参数名映射与错误码映射；
+筛选/裁剪/排序/统计语义由 backend-java 模块的 Java 单测覆盖。
+"""
+import io
 import sys
 import unittest
 from pathlib import Path
@@ -10,215 +17,309 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
 from blueprints import admin_api
 
 
-def _shop(name, group, country_codes=None):
-    return {
-        'shop_name': name,
-        'group_name': group,
-        'country_codes': country_codes or [],
-        'rows': [],
-    }
+def _java_ok(data):
+    """模拟 Java ApiResponse 成功体：{'success': True, 'data': {...}, 'message': ...}。"""
+    return {'success': True, 'data': data, 'message': '操作成功'}, None, 200
 
 
-class DuplicateCheckApiTest(unittest.TestCase):
-    """直接对接口函数做单元测试：缓存通过 _latest_duplicate_scan mock 注入。"""
+def _java_fail_json(code, message):
+    """构建转发失败态：error_response 为 Flask jsonify 对象（需在请求上下文内调用）。"""
+    return ({'success': False, 'message': message, 'code': code},
+            admin_api.jsonify({'success': False, 'error': message}),
+            code)
+
+
+class DuplicateCheckProxyTest(unittest.TestCase):
 
     def setUp(self):
         self.app = Flask(__name__)
         self.app.config['SECRET_KEY'] = 'test-secret'
-        # 4 家店 / 3 个组；ASIN 分布：
-        #  A1: ShopA(UK) + ShopB(UK) —— 跨店重复
-        #  B1: ShopA(DE) 唯一
-        #  C1: ShopC(FR) 唯一
-        #  D1: ShopD(UK) 唯一
-        self.cache = {
+        self.shops = [
+            {'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['UK', 'DE'], 'asin_count': 3, 'record_count': 3},
+            {'shop_name': 'ShopB', 'group_name': 'GroupA', 'country_codes': ['UK'], 'asin_count': 3, 'record_count': 3},
+            {'shop_name': 'ShopC', 'group_name': 'GroupC', 'country_codes': ['FR'], 'asin_count': 2, 'record_count': 2},
+            {'shop_name': 'ShopD', 'group_name': 'GroupD', 'country_codes': ['UK'], 'asin_count': 2, 'record_count': 2},
+        ]
+        self.items_all = [
+            {'asin': 'E0000001', 'shop_count': 3, 'record_count': 3, 'occurrences': [
+                {'asin': 'E0000001', 'date': '2026年8月29日 上午4:34', 'price': 'GBP 12.00', 'brand': 'BrandE',
+                 'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['UK'], 'country': 'UK'},
+                {'asin': 'E0000001', 'date': '2026-08-30', 'price': 'GBP 12.00', 'brand': 'BrandE',
+                 'shop_name': 'ShopB', 'group_name': 'GroupA', 'country_codes': ['UK'], 'country': 'UK'},
+                {'asin': 'E0000001', 'date': '2026-08-31', 'price': 'EUR 12.00', 'brand': 'BrandE',
+                 'shop_name': 'ShopC', 'group_name': 'GroupC', 'country_codes': ['FR'], 'country': 'FR'},
+            ]},
+            {'asin': 'A0000001', 'shop_count': 2, 'record_count': 2, 'occurrences': [
+                {'asin': 'A0000001', 'date': '2026-08-30', 'price': 'GBP 9.99', 'brand': 'BrandA',
+                 'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['UK', 'DE'], 'country': 'UK'},
+                {'asin': 'A0000001', 'date': '2026-08-30 08:30:00', 'price': 'GBP 8.50', 'brand': 'BrandA',
+                 'shop_name': 'ShopB', 'group_name': 'GroupA', 'country_codes': ['UK'], 'country': 'UK'},
+            ]},
+            {'asin': 'F0000001', 'shop_count': 2, 'record_count': 2, 'occurrences': [
+                {'asin': 'F0000001', 'date': '2026-08-28', 'price': 'GBP 6.00', 'brand': 'BrandF',
+                 'shop_name': 'ShopB', 'group_name': 'GroupA', 'country_codes': ['UK'], 'country': 'UK'},
+                {'asin': 'F0000001', 'date': '2026-08-30', 'price': 'GBP 6.00', 'brand': 'BrandF',
+                 'shop_name': 'ShopD', 'group_name': 'GroupD', 'country_codes': ['UK'], 'country': 'UK'},
+            ]},
+            {'asin': 'B0000001', 'shop_count': 1, 'record_count': 1, 'occurrences': [
+                {'asin': 'B0000001', 'date': '2026-08-30', 'price': 'EUR 10.99', 'brand': 'BrandA',
+                 'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['DE'], 'country': 'DE'},
+            ]},
+            {'asin': 'C0000001', 'shop_count': 1, 'record_count': 1, 'occurrences': [
+                {'asin': 'C0000001', 'date': '2026-08-29', 'price': 'EUR 7.50', 'brand': 'BrandC',
+                 'shop_name': 'ShopC', 'group_name': 'GroupC', 'country_codes': ['FR'], 'country': 'FR'},
+            ]},
+            {'asin': 'D0000001', 'shop_count': 1, 'record_count': 1, 'occurrences': [
+                {'asin': 'D0000001', 'date': '2026-08-28', 'price': 'GBP 5.00', 'brand': 'BrandD',
+                 'shop_name': 'ShopD', 'group_name': 'GroupD', 'country_codes': ['UK'], 'country': 'UK'},
+            ]},
+        ]
+        self.overview_all = {
+            'pending': False,
             'scanned_at': '2026-09-04 03:10:00',
             'summary': {
-                'shop_count': 4, 'asin_total': 4, 'record_total': 5,
-                'duplicate_asin_total': 1, 'duplicate_shop_count': 2,
-                'site_count': 3, 'asin_per_shop': 1.2, 'source': 'job',
+                'shop_count': 4, 'asin_total': 6, 'record_total': 10,
+                'duplicate_asin_total': 3, 'duplicate_shop_count': 4,
+                'site_count': 3, 'asin_per_shop': 2.5, 'source': 'job',
             },
-            'shops': [
-                {'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['UK', 'DE'], 'asin_count': 2, 'record_count': 3},
-                {'shop_name': 'ShopB', 'group_name': 'GroupA', 'country_codes': ['UK'], 'asin_count': 1, 'record_count': 1},
-                {'shop_name': 'ShopC', 'group_name': 'GroupC', 'country_codes': ['FR'], 'asin_count': 1, 'record_count': 1},
-                {'shop_name': 'ShopD', 'group_name': 'GroupD', 'country_codes': ['UK'], 'asin_count': 1, 'record_count': 1},
-            ],
-            'items': [
-                {'asin': 'A0000001', 'shop_count': 2, 'record_count': 2, 'occurrences': [
-                    {'asin': 'A0000001', 'date': '2026-08-30', 'price': 'GBP 9.99', 'brand': 'BrandA',
-                     'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['UK', 'DE'], 'country': 'UK'},
-                    {'asin': 'A0000001', 'date': '2026-08-31', 'price': 'GBP 8.50', 'brand': 'BrandA',
-                     'shop_name': 'ShopB', 'group_name': 'GroupA', 'country_codes': ['UK'], 'country': 'UK'},
-                ]},
-                {'asin': 'B0000001', 'shop_count': 1, 'record_count': 1, 'occurrences': [
-                    {'asin': 'B0000001', 'date': '2026-08-30', 'price': 'EUR 10.99', 'brand': 'BrandA',
-                     'shop_name': 'ShopA', 'group_name': 'GroupA', 'country_codes': ['DE'], 'country': 'DE'},
-                ]},
-                {'asin': 'C0000001', 'shop_count': 1, 'record_count': 1, 'occurrences': [
-                    {'asin': 'C0000001', 'date': '2026-08-29', 'price': 'EUR 7.50', 'brand': 'BrandC',
-                     'shop_name': 'ShopC', 'group_name': 'GroupC', 'country_codes': ['FR'], 'country': 'FR'},
-                ]},
-                {'asin': 'D0000001', 'shop_count': 1, 'record_count': 1, 'occurrences': [
-                    {'asin': 'D0000001', 'date': '2026-08-28', 'price': 'GBP 5.00', 'brand': 'BrandD',
-                     'shop_name': 'ShopD', 'group_name': 'GroupD', 'country_codes': ['UK'], 'country': 'UK'},
-                ]},
-            ],
+            'shops': self.shops,
         }
 
-    def _access_patches(self, role='super_admin', current_row=None):
-        return [
-            patch.object(admin_api, '_ensure_backend_menu_access',
-                         return_value=(role, current_row or {'id': 1}, None)),
-            patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
-                         return_value=(role, current_row or {'id': 1}, None)),
-            patch.object(admin_api, '_latest_duplicate_scan', return_value=self.cache),
-        ]
+    def _patched(self, data):
+        return patch.object(admin_api, '_proxy_backend_java', side_effect=lambda *a, **k: _java_ok(data))
 
-    def _call(self, url, role='super_admin', current_row=None):
+    def _call(self, view_name, url, data, role='super_admin', current_row=None):
         with self.app.test_request_context(url):
-            with patch('utils.auth.session', {'user_id': 1}), \
-                    patch('utils.auth.is_session_user_valid', return_value=True):
-                for p in self._access_patches(role, current_row):
-                    p.start()
-                try:
-                    return admin_api.shop_data_crawl_duplicate_check_items()
-                finally:
-                    for p in reversed(self._access_patches(role, current_row)):
-                        p.stop()
-
-    def test_overview_super_admin_sees_all(self):
-        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-overview'):
             with patch('utils.auth.session', {'user_id': 1}), \
                     patch('utils.auth.is_session_user_valid', return_value=True), \
-                    patch.object(admin_api, '_ensure_backend_menu_access', return_value=('super_admin', {'id': 1}, None)), \
-                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=('super_admin', {'id': 1}, None)), \
-                    patch.object(admin_api, '_latest_duplicate_scan', return_value=self.cache):
-                response = admin_api.shop_data_crawl_duplicate_check_overview()
+                    patch.object(admin_api, '_ensure_backend_menu_access',
+                                 return_value=(role, current_row or {'id': 1}, None)), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=(role, current_row or {'id': 1}, None)), \
+                    self._patched(data):
+                return getattr(admin_api, view_name)()
+
+    def test_overview_super_admin_passthrough(self):
+        response = self._call('shop_data_crawl_duplicate_check_overview',
+                              '/api/admin/shop-data-crawl/duplicate-check-overview',
+                              self.overview_all)
         body = response.get_json()
         self.assertTrue(body['success'])
         self.assertFalse(body['pending'])
-        self.assertEqual(body['summary']['asin_total'], 4)
-        self.assertEqual(body['summary']['record_total'], 5)
-        self.assertEqual(body['summary']['duplicate_asin_total'], 1)
+        self.assertEqual(body['summary']['asin_total'], 6)
         self.assertEqual(len(body['shops']), 4)
 
-    def test_items_matix_columns_are_shops(self):
-        response = self._call('/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&view=monitor')
+    def test_overview_pending_empty_summary(self):
+        response = self._call('shop_data_crawl_duplicate_check_overview',
+                              '/api/admin/shop-data-crawl/duplicate-check-overview',
+                              {'pending': True, 'scanned_at': '', 'summary': {}, 'shops': []})
         body = response.get_json()
         self.assertTrue(body['success'])
-        self.assertEqual(body['total'], 1)  # monitor 只保留跨店重复
-        self.assertEqual(body['items'][0]['asin'], 'A0000001')
+        self.assertTrue(body['pending'])
+        self.assertEqual(body['summary'], {})
+
+    def test_overview_force_passed_through(self):
+        captured = {}
+        data = dict(self.overview_all)
+
+        def side_effect(*args, **kwargs):
+            captured['params'] = kwargs.get('params')
+            captured['timeout'] = kwargs.get('timeout')
+            return _java_ok(data)
+
+        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-overview?force=1'):
+            with patch('utils.auth.session', {'user_id': 1}), \
+                    patch('utils.auth.is_session_user_valid', return_value=True), \
+                    patch.object(admin_api, '_ensure_backend_menu_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_proxy_backend_java', side_effect=side_effect):
+                response = admin_api.shop_data_crawl_duplicate_check_overview()
+        body = response.get_json()
+        self.assertTrue(body['success'])
+        self.assertEqual((captured['params'] or {}).get('force'), '1')
+        # force 同步扫描需要长超时
+        self.assertEqual(captured['timeout'], (10, 1800))
+
+    def test_overview_scan_conflict_409(self):
+        def side_effect(*args, **kwargs):
+            return _java_fail_json(409, '扫描进行中，请稍后刷新')
+
+        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-overview?force=1'):
+            with patch('utils.auth.session', {'user_id': 1}), \
+                    patch('utils.auth.is_session_user_valid', return_value=True), \
+                    patch.object(admin_api, '_ensure_backend_menu_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_proxy_backend_java', side_effect=side_effect):
+                response = admin_api.shop_data_crawl_duplicate_check_overview()
+        self.assertEqual(response[1], 409)
+        self.assertFalse(response[0].get_json()['success'])
+        self.assertEqual(response[0].get_json()['error'], '扫描进行中，请稍后刷新')
+
+    def test_items_matrix_monitor_total_and_columns(self):
+        data = {'pending': False, 'items': self.items_all[:3], 'shops': self.shops,
+                'total': 3, 'page': 1, 'page_size': 20, 'scanned_at': '2026-09-04 03:10:00'}
+        response = self._call('shop_data_crawl_duplicate_check_items',
+                              '/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&view=monitor',
+                              data)
+        body = response.get_json()
+        self.assertTrue(body['success'])
+        self.assertEqual(body['total'], 3)
         self.assertEqual([shop['shop_name'] for shop in body['shops']],
                          ['ShopA', 'ShopB', 'ShopC', 'ShopD'])
 
-    def test_items_all_view_includes_unique_asins(self):
-        response = self._call('/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&view=all')
-        body = response.get_json()
-        self.assertEqual(body['total'], 4)
+    def test_items_all_view_passthrough(self):
+        data = {'pending': False, 'items': self.items_all, 'shops': self.shops,
+                'total': 6, 'page': 1, 'page_size': 20, 'scanned_at': '2026-09-04 03:10:00'}
+        response = self._call('shop_data_crawl_duplicate_check_items',
+                              '/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&view=all',
+                              data)
+        self.assertEqual(response.get_json()['total'], 6)
 
-    def test_items_filter_by_asin_and_site(self):
-        response = self._call('/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&asin=A0000001&site=UK')
-        body = response.get_json()
-        self.assertEqual(body['total'], 1)
-        self.assertEqual(body['items'][0]['asin'], 'A0000001')
+    def test_items_shop_name_alias_merged_and_camel_params(self):
+        captured = {}
 
-    def test_leader_sees_only_own_group_shops(self):
-        # 主管 id=653 只管理 GroupA（含 ShopA/ShopB）
-        with patch.object(admin_api, '_shop_data_managed_shop_names',
-                          return_value={'shopa', 'shopb'}):
-            response = self._call('/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&view=all',
-                                  role='admin', current_row={'id': 653})
-        body = response.get_json()
-        self.assertEqual([shop['shop_name'] for shop in body['shops']], ['ShopA', 'ShopB'])
-        self.assertEqual(body['total'], 2)  # A0000001（跨店）+ B0000001（唯一）
-        # 跨店 ASIN 在主管范围内仍是 2 家店
-        item = next(i for i in body['items'] if i['asin'] == 'A0000001')
-        self.assertEqual(item['shop_count'], 2)
+        def side_effect(*args, **kwargs):
+            captured['params'] = kwargs.get('params') or {}
+            return _java_ok({'pending': False, 'items': [], 'shops': [],
+                             'total': 0, 'page': 1, 'page_size': 20, 'scanned_at': ''})
 
-    def test_leader_overview_stats_recomputed_after_filter(self):
-        # 主管见 2 家店：唯一ASIN 2、上架记录 3、重复ASIN 1、重复店铺 2
-        with patch.object(admin_api, '_shop_data_managed_shop_names',
-                          return_value={'shopa', 'shopb'}):
-            with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-overview'):
-                with patch('utils.auth.session', {'user_id': 1}), \
-                        patch('utils.auth.is_session_user_valid', return_value=True), \
-                        patch.object(admin_api, '_ensure_backend_menu_access', return_value=('admin', {'id': 653}, None)), \
-                        patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=('admin', {'id': 653}, None)), \
-                        patch.object(admin_api, '_latest_duplicate_scan', return_value=self.cache):
-                    response = admin_api.shop_data_crawl_duplicate_check_overview()
-        body = response.get_json()
-        self.assertEqual(body['summary']['shop_count'], 2)
-        self.assertEqual(body['summary']['asin_total'], 2)
-        self.assertEqual(body['summary']['record_total'], 3)
-        self.assertEqual(body['summary']['duplicate_asin_total'], 1)
-
-    def test_leader_sees_nothing_when_no_group(self):
-        with patch.object(admin_api, '_shop_data_managed_shop_names', return_value=set()):
-            response = self._call('/api/admin/shop-data-crawl/duplicate-check-items?page=1&page_size=20&view=all',
-                                  role='admin', current_row={'id': 999999})
-        body = response.get_json()
-        self.assertEqual(body['shops'], [])
-        self.assertEqual(body['total'], 0)
-
-    def test_export_csv_contains_filtered_rows(self):
-        """导出 CSV：行=上架记录，含 BOM，按筛选裁剪。"""
-        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-export?'):
+        with self.app.test_request_context(
+                '/api/admin/shop-data-crawl/duplicate-check-items?page=2&page_size=50&view=all&shop=ShopA&asin=abc'):
+            # 内部代理 operatorId 从 flask session 取当前登录管理员
+            admin_api.session['user_id'] = 1
             with patch('utils.auth.session', {'user_id': 1}), \
                     patch('utils.auth.is_session_user_valid', return_value=True), \
-                    patch.object(admin_api, '_ensure_backend_menu_access', return_value=('super_admin', {'id': 1}, None)), \
-                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=('super_admin', {'id': 1}, None)), \
-                    patch.object(admin_api, '_latest_duplicate_scan', return_value=self.cache):
-                response = admin_api.shop_data_crawl_duplicate_check_export()
-        self.assertEqual(response.status_code, 200)
-        text = response.get_data(as_text=True)
-        self.assertTrue(text.startswith(''))
-        lines = text.lstrip('').strip().splitlines()
-        self.assertEqual(lines[0], 'ASIN,店铺数,店铺,分组,站点,上架时间,价格,品牌')
-        self.assertEqual(len(lines), 3)  # header + 两条上架记录（A0000001 两店各一条）
+                    patch.object(admin_api, '_ensure_backend_menu_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_proxy_backend_java', side_effect=side_effect):
+                admin_api.shop_data_crawl_duplicate_check_items()
+        params = captured['params']
+        self.assertEqual(params['page'], '2')
+        self.assertEqual(params['pageSize'], '50')
+        self.assertEqual(params['shopName'], 'ShopA')  # shop 别名合并进 shop_name→shopName
+        self.assertEqual(params['asin'], 'abc')
+        self.assertIn('operatorId', params)
+
+    def test_items_denied_403_message_preserved(self):
+        def denied_menu(*args, **kwargs):
+            return ('admin', {'id': 5}, (
+                admin_api.jsonify({'success': False, 'error': '无权访问店铺数据记录模块'}), 403))
+
+        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-items'):
+            with patch('utils.auth.session', {'user_id': 1}), \
+                    patch('utils.auth.is_session_user_valid', return_value=True), \
+                    patch.object(admin_api, '_ensure_backend_menu_access', side_effect=denied_menu), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=('admin', {'id': 5}, None)), \
+                    patch.object(admin_api, '_proxy_backend_java',
+                                 side_effect=lambda *a, **k: _java_ok({})):
+                response = admin_api.shop_data_crawl_duplicate_check_items()
+        self.assertEqual(response[1], 403)
+        body = response[0].get_json()
+        self.assertEqual(body['error'], '无权访问店铺数据记录模块')
+
+    def test_detail_sorted_passthrough(self):
+        detail_items = [
+            {'asin': 'E0000001', 'shop_count': 3, 'record_count': 3, 'shop_names': ['ShopA', 'ShopB', 'ShopC'],
+             'brand': 'BrandE', 'first_date': '2026-08-29 04:34:00', 'occurrences': self.items_all[0]['occurrences']},
+            {'asin': 'A0000001', 'shop_count': 2, 'record_count': 2, 'shop_names': ['ShopA', 'ShopB'],
+             'brand': 'BrandA', 'first_date': '2026-08-30 00:00:00', 'occurrences': self.items_all[1]['occurrences']},
+            {'asin': 'F0000001', 'shop_count': 2, 'record_count': 2, 'shop_names': ['ShopB', 'ShopD'],
+             'brand': 'BrandF', 'first_date': '2026-08-28 00:00:00', 'occurrences': self.items_all[2]['occurrences']},
+        ]
+        data = {'pending': False, 'items': detail_items, 'total': 3,
+                'page': 1, 'page_size': 6, 'scanned_at': '2026-09-04 03:10:00'}
+        response = self._call('shop_data_crawl_duplicate_check_detail',
+                              '/api/admin/shop-data-crawl/duplicate-check-detail?page=1&page_size=6',
+                              data)
+        body = response.get_json()
+        self.assertEqual(body['total'], 3)
+        self.assertEqual(body['items'][0]['asin'], 'E0000001')
+        self.assertEqual(body['items'][0]['first_date'], '2026-08-29 04:34:00')
+
+    def test_detail_pending(self):
+        response = self._call('shop_data_crawl_duplicate_check_detail',
+                              '/api/admin/shop-data-crawl/duplicate-check-detail',
+                              {'pending': True, 'items': [], 'total': 0, 'page': 1, 'page_size': 6, 'scanned_at': ''})
+        body = response.get_json()
+        self.assertTrue(body['pending'])
+        self.assertEqual(body['items'], [])
+
+    def test_export_streams_java_csv(self):
+        csv_bytes = ('' + 'ASIN,店铺数,店铺,分组,站点,上架时间,价格,品牌\r\n'
+                     'E0000001,3,ShopA,GroupA,UK,2026年8月29日 上午4:34,GBP 12.00,BrandE\r\n').encode('utf-8')
+
+        class FakeResp:
+            status_code = 200
+            headers = {'Content-Disposition': 'attachment; filename="shop-data-duplicate-check.csv"',
+                       'Content-Type': 'text/csv; charset=utf-8'}
+
+            def iter_content(self, chunk_size=1):
+                yield csv_bytes
+
+            def close(self):
+                pass
+
+            def json(self):
+                return {}
+
+        class FakeSession:
+            def get(self, *args, **kwargs):
+                return FakeResp()
 
-    def test_export_monitor_view_excludes_unique_asins(self):
         with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-export?view=monitor'):
             with patch('utils.auth.session', {'user_id': 1}), \
                     patch('utils.auth.is_session_user_valid', return_value=True), \
-                    patch.object(admin_api, '_ensure_backend_menu_access', return_value=('super_admin', {'id': 1}, None)), \
-                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access', return_value=('super_admin', {'id': 1}, None)), \
-                    patch.object(admin_api, '_latest_duplicate_scan', return_value=self.cache):
+                    patch.object(admin_api, 'get_current_admin_role',
+                                 return_value=('super_admin', {'id': 1})), \
+                    patch.object(admin_api, '_ensure_backend_menu_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_get_backend_java_session', return_value=FakeSession()):
                 response = admin_api.shop_data_crawl_duplicate_check_export()
-        lines = response.get_data(as_text=True).lstrip('').strip().splitlines()
-        self.assertEqual(len(lines), 3)
-        self.assertIn('A0000001', lines[1])
+        body = b''.join(response.response)
+        self.assertTrue(body.startswith(b'\xef\xbb\xbf'))
+        self.assertIn('ASIN,店铺数'.encode('utf-8'), body)
+        self.assertIn('E0000001'.encode('utf-8'), body)
 
-    def test_internal_request_falls_back_to_system_operator(self):
-        """无请求上下文（定时扫描线程）时，内部请求用系统级超管作为 operatorId。"""
-        with patch('utils.auth.session', {'user_id': 1}):  # 仅用于模拟无异常环境
-            # 无请求上下文：has_request_context() 为 False，直接走 _resolve_system_operator_id
-            with patch.object(admin_api, '_resolve_internal_token', return_value='test-token'), \
-                    patch.object(admin_api, '_resolve_system_operator_id', return_value=7):
-                headers, params = admin_api._backend_java_internal_request()
-        self.assertEqual(headers.get('X-Internal-Token'), 'test-token')
-        self.assertEqual(params, {'operatorId': 7})
+    def test_export_no_scan_400(self):
+        class FakeResp:
+            status_code = 400
+            headers = {}
 
-    def test_internal_request_system_operator_missing_fails(self):
-        """无请求上下文且系统中没有任何管理员时，直接报错而不是传 0。"""
-        with patch.object(admin_api, '_resolve_internal_token', return_value='test-token'), \
-                patch.object(admin_api, '_resolve_system_operator_id', return_value=None):
-            with self.assertRaises(ValueError):
-                admin_api._backend_java_internal_request()
+            def json(self):
+                return {'success': False, 'message': '暂无扫描结果，请先点击「重新分析」'}
 
-    def test_fetch_result_bytes_rejects_json_error_body(self):
-        """Java 内部端点返回 JSON 错误体（如鉴权失败）时，抛出业务错误而不是 BadZipFile。"""
-        fake_response = Mock()
-        fake_response.raise_for_status = Mock()
-        fake_response.iter_content = Mock(return_value=[
-            '{"success":false,"message":"用户不存在","data":null,"code":401}'.encode('utf-8')])
-        fake_response.close = Mock()
-        with patch.object(admin_api, '_backend_java_internal_request',
-                          return_value=({'X-Internal-Token': 'test-token'}, {'operatorId': 7})), \
-                patch.object(admin_api, '_get_backend_java_session') as fake_session:
-            fake_session.return_value.get = Mock(return_value=fake_response)
-            with self.assertRaises(ValueError) as ctx:
-                admin_api._shop_data_crawl_fetch_result_bytes({'result_id': 123})
-        self.assertIn('用户不存在', str(ctx.exception))
+            def close(self):
+                pass
+
+            def iter_content(self, chunk_size=1):
+                return iter(())
+
+        class FakeSession:
+            def get(self, *args, **kwargs):
+                return FakeResp()
+
+        with self.app.test_request_context('/api/admin/shop-data-crawl/duplicate-check-export'):
+            with patch('utils.auth.session', {'user_id': 1}), \
+                    patch('utils.auth.is_session_user_valid', return_value=True), \
+                    patch.object(admin_api, 'get_current_admin_role',
+                                 return_value=('super_admin', {'id': 1})), \
+                    patch.object(admin_api, '_ensure_backend_menu_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_ensure_shop_data_crawl_data_access',
+                                 return_value=('super_admin', {'id': 1}, None)), \
+                    patch.object(admin_api, '_get_backend_java_session', return_value=FakeSession()):
+                response = admin_api.shop_data_crawl_duplicate_check_export()
+        self.assertEqual(response[1], 400)
+        self.assertEqual(response[0].get_json()['error'], '暂无扫描结果，请先点击「重新分析」')
 
 
 if __name__ == '__main__':

backend/web_source/admin.html

@@ -1337,47 +1337,69 @@
             min-height: 120px;
             max-height: 250px;
             overflow-y: auto;
-            display: flex;
-            flex-direction: column;
-            gap: 7px;
+            display: grid;
+            grid-template-columns: repeat(2, minmax(0, 1fr));
+            align-content: start;
+            gap: 8px;
             padding-right: 2px;
         }
 
-        .dup-chart-row {
-            display: grid;
-            grid-template-columns: minmax(70px, 96px) minmax(0, 1fr) 44px;
-            align-items: center;
-            gap: 9px;
+        /* 店铺上架分布：双列网格（店名 + 记录数 / 进度条 / N 个 ASIN） */
+        .dup-dist-item {
+            min-width: 0;
+            display: flex;
+            flex-direction: column;
+            gap: 6px;
+            padding: 10px 12px;
+            background: #fbfcfe;
+            border: 1px solid var(--c-border);
+            border-radius: 8px;
         }
 
-        .dup-chart-name {
-            font-size: 12px;
-            color: var(--c-text-2);
+        .dup-dist-item-head {
+            display: flex;
+            align-items: baseline;
+            justify-content: space-between;
+            gap: 8px;
+        }
+
+        .dup-dist-name {
+            min-width: 0;
+            font-size: 12.5px;
+            font-weight: 700;
+            color: var(--c-text);
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
         }
 
-        .dup-chart-track {
-            height: 16px;
+        .dup-dist-record {
+            flex: 0 0 auto;
+            font-size: 15px;
+            font-weight: 800;
+            color: var(--c-primary-strong);
+            font-variant-numeric: tabular-nums;
+        }
+
+        .dup-dist-track {
+            height: 7px;
             background: #eef0f6;
-            border-radius: 5px;
+            border-radius: 999px;
             overflow: hidden;
         }
 
-        .dup-chart-fill {
+        .dup-dist-fill {
+            display: block;
             height: 100%;
             min-width: 2px;
             background: linear-gradient(90deg, var(--c-primary), #8b8ff3);
-            border-radius: 5px;
+            border-radius: 999px;
             transition: width 0.3s ease;
         }
 
-        .dup-chart-num {
+        .dup-dist-asin {
             font-size: 12px;
-            font-weight: 700;
-            color: var(--c-text);
-            text-align: right;
+            color: var(--c-text-3);
             font-variant-numeric: tabular-nums;
         }
 
@@ -1532,6 +1554,82 @@
             border: 1px solid var(--c-border);
         }
 
+        /* 国家彩色徽章（撞款详情卡片 / 抽屉）：DE橙 / UK靛蓝 / FR蓝 / IT绿 / ES红 / 其他兜底 */
+        .dup-site-badge {
+            display: inline-flex;
+            align-items: center;
+            padding: 2px 9px;
+            border-radius: 999px;
+            font-size: 11.5px;
+            font-weight: 700;
+            line-height: 1.6;
+            white-space: nowrap;
+            vertical-align: middle;
+        }
+
+        .dup-site-DE { background: #fff1e3; color: #c2570a; border: 1px solid #f3cba4; }
+        .dup-site-UK { background: #eeedfb; color: #5451d6; border: 1px solid #c9c7f2; }
+        .dup-site-FR { background: #e5f0fd; color: #1d5fc2; border: 1px solid #b5d3f5; }
+        .dup-site-IT { background: #e3f6ec; color: #18774c; border: 1px solid #aadcc2; }
+        .dup-site-ES { background: #fdeaea; color: #c03a2e; border: 1px solid #f2bcba; }
+        .dup-site-NA,
+        .dup-site- { background: #f4f6fa; color: var(--c-text-3); border: 1px solid var(--c-border); }
+
+        /* 抽屉底部徽章组：彩色滴状标签 */
+        .dup-drawer-inline-badges {
+            display: flex;
+            flex-wrap: wrap;
+            align-items: center;
+            gap: 6px;
+            margin-top: 6px;
+        }
+
+        .dup-drawer-badge {
+            display: inline-flex;
+            align-items: center;
+            gap: 4px;
+            padding: 3px 11px;
+            border-radius: 8px;
+            font-size: 12px;
+            font-weight: 700;
+            line-height: 1.5;
+            white-space: nowrap;
+            background: #eef2f7;
+            color: var(--c-text-2);
+        }
+
+        .dup-drawer-badge-danger { background: #fdecec; color: #d8483a; border: 1px solid #f3bcb8; }
+        .dup-drawer-badge-blue { background: var(--c-primary-soft); color: var(--c-primary-strong); border: 1px solid #d3d6fa; }
+        .dup-drawer-badge-green { background: #e3f6ec; color: #18774c; border: 1px solid #aadcc2; }
+        .dup-drawer-badge-cyan { background: #e0f5f9; color: #0e7d94; border: 1px solid #a8e0ec; }
+
+        /* 抽屉头部 ASIN 与品牌行 */
+        .dup-drawer-asin {
+            font-family: Consolas, Menlo, monospace;
+            font-size: 17px;
+            font-weight: 800;
+            color: var(--c-primary-strong);
+            letter-spacing: 0.02em;
+        }
+
+        .dup-drawer-brand-line {
+            padding: 12px 0;
+            font-size: 13px;
+            color: var(--c-text);
+            border-bottom: 1px solid var(--c-border);
+            overflow-wrap: anywhere;
+        }
+
+        .dup-check-drawer-table td.dup-date {
+            color: var(--c-text-2);
+            font-variant-numeric: tabular-nums;
+        }
+
+        .drawer-subtitle.dup-drawer-subtitle {
+            color: var(--c-text-2);
+            font-size: 12.5px;
+        }
+
         .dup-check-drawer-meta {
             display: grid;
             grid-template-columns: 88px minmax(0, 1fr);
@@ -1598,6 +1696,10 @@
             .dup-check-metrics {
                 grid-template-columns: repeat(2, minmax(0, 1fr));
             }
+
+            .dup-check-distribution-bars {
+                grid-template-columns: minmax(0, 1fr);
+            }
         }
 
         .thumb {
@@ -5585,6 +5687,7 @@
                         <span class="dup-check-detail-sub">同一 ASIN 在多条店铺的上架明细</span>
                     </div>
                     <div class="dup-check-detail-cards" id="dupCheckDetailCards"></div>
+                    <div class="pagination" id="dupCheckDetailPagination" style="margin-top:12px;"></div>
                 </div>
                 <div class="drawer-mask" id="dupCheckDrawerMask">
                     <aside class="drawer" role="dialog" aria-modal="true" aria-label="ASIN 详情">