隔离美国报价口径，完善条件更正和订单分页

AGENTS.md

@@ -16,6 +16,7 @@ Use `am.py` for CLI/WSGI, `logistics_chat/` for business code, and `static/css/`
 | Pricing | `logistics_chat/pricing.py`: `RATES`, `calc_freight`; `quote_intent.py`: `parse_intent`; `quote_service.py`: `answer_quote`; `quote_engine.py`: `quantity`, `render_rates`; `quote_answers.py`, `quote_fees.py`: local business terms and fees |
 | US quote data | `logistics_chat/quote_workbook.py`: local detail export; `quote_data.py`: versioned SQLite imports; `quote_engine.py`: matching/calculation; `quote_service.py`: conversational reply; `scripts/import_quote_data.py` |
 | Common customer questions | `logistics_chat/shipping_faq.py`: pre-shipment material; `quote_allocations.py`: per-warehouse weights; `quote_context.py`: chronological edits; `order_explanations.py`: business status, latest actual nodes and operation boundaries |
+| Reply boundaries / list pages | `logistics_chat/customer_faq.py`: supported actions; `quote_scope.py`: US-only fallback; `quote_edits.py`: rejected conditions; `quote_material.py`: partial metal chargeable weight; `order_listing.py`: scoped counts and conversation pages |
 | Tracking | `logistics_chat/tracking.py`: `extract_tracking_no`, `build_track`, `CARD_PREFIX` |
 | Order test data | `logistics_chat/order_data.py`: `lookup_order`, `count_orders`, `answer_query`, `import_records`; `scripts/import_order_test_data.py` |
 | Persistence | `logistics_chat/db.py`: `init_db`, `save_message`; `logistics_chat/history_service.py` |

docs/architecture.md

@@ -145,6 +145,16 @@ tests/                        # 按业务模块组织的回归
 
 `shipping_faq.py` 从激活版本回答交仓、标签、报关资料及查验费用问题；具体船期和计划发货日期需人工核对，不使用旧表日期承诺必达。`order_explanations.py` 只解释授权订单的业务状态和实际节点，不把预计节点当实际位置，不推断逐箱签收或亚马逊上架。文字事实回复与订单卡片同样绑定客户及范围；催单或拦截不声称已提交。本轮不扩展售后理赔规则。
 
+`customer_faq.py` 在报价分流前处理下单、短信查单、开票、导出及附件读取等能力说明，不生成业务操作成功的假回复。美国常见费用/毛净重/议价/总价追问由当前价表直接回答；`quote_scope.py` 将尚未匹配的美国咨询保留为明确的核对回复，不送入旧欧洲/英国知识库。明确切换其他国家时仍走该地区原有分流，理赔规则未扩展。
+
+`quote_edits.py` 先移除被明确否定的仓码或交货仓，再解析替换条件。共享尺寸解析支持英寸转换和口语长宽高，“一个箱子”可形成单箱条件；总计立方米不作为尺寸单位“米”。
+
+`order_listing.py` 负责列表与下一页/上一页/指定页码，每页20票；从当前会话最近的列表回复恢复页码和业务状态，重新以服务端客户范围查询实际总数和该页数据。COUNT与分页读取处于同一只读事务；无有效列表上下文时要求先列订单，不推测剩余数量。页码有界，筛选及翻页回复与订单事实一样保护历史，不增加公开API或管理入口。
+
+已确认海派计费重保留原小数，不向上取整，每箱最低12KG仍生效。原实重小数原样展示；无限小数的材积结果以“约”展示有限位数，金额计算仍使用原Decimal精度，不把显示近似当作计费进位。
+
+铁铝附加费只按铁铝货物计费重计算。`quote_material.py` 区分整票铁铝、部分铁铝与未明确材质的金属，并将明确的“铁铝部分计费重”从整票毛重解析中分离。部分货物未提供计费重时不按整票加费；提供明确基数后可将该项人民币费用加到公斤或按方运费中。更改整票重量、箱数或箱规后清除旧的部分计费重，防止沿用过期基数。未明确金属是否属于铁铝时先核实材质，不把所有金属都认作铁铝。
+
 先按 README 安装项目依赖。Windows 使用 `.\.venv\Scripts\python.exe -m pytest -v` 或同解释器的 `-m unittest discover -s tests -v`；Linux/macOS 使用 `.venv/bin/python`。业务测试依赖 Flask，不能用未安装依赖的全局 Python 运行整套测试。模型请求全部模拟，不代表真实 DeepSeek 联调。
 
 路径、函数或资产移动后同步更新根 `AGENTS.md`、本文、知识资料和 README 目录树。仅改导航时检查路径、符号、命令；改业务时补充相关成功和失败分支，前端改动检查实际页面。

logistics_chat/chat_service.py

@@ -91,14 +91,18 @@ def create_chat_stream(msg, conv_id):
                 return (sse(order_login_response()) + sse({'d':1}), {})
             return (sse({'e':'该会话已删除，请新建对话后重试。'}), {})
     order_answer = answer_query(msg, conv_id)
+    if order_answer is None:
+        from .customer_faq import answer_capability
+        order_answer = answer_capability(msg)
     if order_answer is None:
         order_answer = answer_quote(msg, conv_id)
     if order_answer is None and re.search(r'(?:转|联系|接入|找).*人工|人工客服',msg):
         order_answer = {'t':'点击“联系人工”可发起人工客服申请；非工作时间可留言。'}
-    if order_answer is None and re.search(r'照片|图片',msg) and re.search(r'报价|价格|判断|识别',msg):
-        order_answer = {'t':'可以通过输入框旁的“+”上传照片供人工查看。当前聊天不会自动识别图片，请同时用文字提供品名、重量、箱数、尺寸和目的仓码或邮编，再核算报价。'}
     if order_answer is None and re.fullmatch(r'\[图片\]/uploads/\S+', msg):
         order_answer = {'t':'收到您的图片，请描述一下您的问题。'}
+    if order_answer is None:
+        from .quote_scope import answer_us_fallback
+        order_answer = answer_us_fallback(msg,conv_id)
     ship = shipping_intent_with_context(msg, conv_id) if order_answer is None else None
     if ship and ship['region'] is None and (ship['weight'] is not None or ship['dims'] or
             re.search(r'\d+(?:\.\d+)?\s*(?:cbm|方|立方)', msg, re.I) or

logistics_chat/customer_faq.py

@@ -0,0 +1,21 @@
+"""Describe supported customer actions without inventing operational integrations."""
+
+import re
+
+
+def answer_capability(message):
+    if re.search(r'照片|图片',message) and re.search(r'报价|价格|判断|识别|尺寸',message):
+        return {'t':'可以通过输入框旁的“+”上传照片供人工查看。当前聊天不会自动识别图片，请同时用文字提供品名、重量、箱数、尺寸和目的仓码或邮编，再核算报价。'}
+    if re.search(r'(?:手机号|手机号码|电话号码).*(?:查|订单|运单)|(?:查|查询).*手机号',message):
+        return {'t':'当前请使用客户账号登录后，按入仓码查询订单；暂不支持手机号或短信验证码查单。没有入仓码可联系人工核实订单归属。'}
+    if re.search(r'下单(?!号|时间|日期)|订舱|生成订单|创建订单|预约提货|安排提货|\b(?:place|create)\s+(?:an?\s+)?order\b',message,re.I):
+        return {'t':'下单、订舱和安排提货需要联系人工办理。当前可查询报价及已关联订单，尚未创建订单或安排提货；请提供目的仓、品名、箱数、重量和尺寸供人工核对。'}
+    if re.search(r'开(?:发票|票)|发票.*(?:税点|几个点|怎么开|申请)|月结|账期|付款账号|收款账号|银行账号|打款|(?:怎么|如何)付款',message):
+        return {'t':'开票税点、月结资格及付款方式需要由专属业务员确认。请联系人工核对对应订单和结算信息；当前聊天不提供未经确认的税点或收款账号。'}
+    if re.search(r'导出.*(?:订单|运单|Excel)|(?:订单|运单).*导出',message,re.I):
+        return {'t':'当前聊天暂不提供订单Excel导出，可联系人工核对导出需求。可先查看账号内订单列表，或发送入仓码查询单票详情。'}
+    if re.search(r'Excel|表格',message,re.I) and re.search(r'直接读|自动读|读取|识别|读里面',message):
+        return {'t':'当前聊天不会自动读取Excel附件里的箱规。请将每箱重量、长宽高及目的仓码粘贴为文字，我可据此核算；批量表格可交人工整理。'}
+    if re.search(r'换.*手机|换.*设备|跨设备|清除.*(?:浏览器|缓存)',message) and re.search(r'聊天|记录|历史',message):
+        return {'t':'当前聊天记录与原浏览器的访客身份关联，换手机或清除浏览器数据后不会自动同步恢复。请先在原设备查看；客户账号目前用于订单权限校验，尚未提供跨设备聊天同步。'}
+    return None

logistics_chat/order_data.py

@@ -219,44 +219,14 @@ def answer_count_query(intent, tenants):
     return {'t':text + f"，其中 {counts['with_inbound']} 票已登记入仓码。", '_customer_data':True}
 
 
-def answer_list_query(message, tenants):
-    """Reuse bounded status parsing; list reads require an explicit customer scope."""
-    if is_lookup_help(message) or not re.search(r'订单|运单|\borders?\b|\bshipments?\b',message,re.I):
-        return None
-    if not re.search(r'列出|列表|全部|所有|\blist\b',message,re.I):
-        return None
-    if not tenants:
-        return order_login_response()
-    question=re.sub(r'列出|列表|全部|所有|\blist\b','多少',message,flags=re.I)
-    intent=parse_count_query(question)
-    if intent is None or intent['unsupported']:
-        return {'t':'暂不支持按这个条件列出订单。可查看全部订单或按履约中、已完成等业务状态查询。'}
-    scope=tenant_filter(tenant_ids=tenants)
-    if scope is None:
-        return order_login_response()
-    from .db import connect
-    connection=None
-    try:
-        connection=connect()
-        sql='SELECT order_no,inbound_code,status,warehouse_code FROM order_test_data WHERE 1=1'+scope[0]
-        values=scope[1]
-        if intent['status']:
-            sql+=' AND status=?';values=values+[intent['status']]
-        rows=connection.execute(sql+' ORDER BY id DESC LIMIT 21',values).fetchall()
-        if not rows:return {'t':'当前账号下没有符合条件的订单。','_customer_data':True}
-        lines=['您当前的订单列表'+('（先列出20票）' if len(rows)>20 else '')+'：']
-        for number,inbound,status,warehouse in rows[:20]:
-            lines.append(f'- 入仓码：{inbound or "未登记"}；订单号：{number}；业务状态：{STATUS_LABELS.get(status,status)}；目的仓：{warehouse or "未登记"}')
-        lines.append('发送入仓码可查询该票订单和物流轨迹。')
-        return {'t':'\n'.join(lines),'_customer_data':True}
-    except sqlite3.Error:
-        return {'t':'订单信息暂时无法读取，请稍后重试。'}
-    finally:
-        if connection is not None:connection.close()
+def answer_list_query(message, tenants, conv_id=None):
+    from .order_listing import answer_list
+    return answer_list(message,tenants,conv_id)
 
 
 def extract_reference(message):
     # Explicit postal/monetary fields are not order identifiers, even if invalid.
+    message = re.sub(r'(?:手机号|手机号码|电话号码|联系电话|电话)\s*[:：是为]?\s*(?:\+?86[-\s]?)?1[3-9]\d{9}', ' ', message)
     message = re.sub(r'(?:邮编|zip(?:\s*code)?|post\s*code)\s*[:：为是]?\s*[0-9-]+', ' ', message, flags=re.I)
     message = re.sub(r'(?<![A-Za-z0-9_-])\d+(?:\.\d+)?\s*(?:万)?(?:USD|RMB|CNY|美元|美金|人民币|元)(?![A-Za-z0-9_-])',' ',message,flags=re.I)
     message = re.sub(r'\[(?:图片|文件)\]/uploads/\S+|https?://\S+', '', message)
@@ -264,7 +234,7 @@ def extract_reference(message):
                      r'(?:[T ]\d{1,2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:?\d{2})?)?'
                      r'(?![A-Za-z0-9_-])', ' ', message)
     message = re.sub(r'(?<![A-Za-z0-9_.-])\d+(?:\.\d+)?\s*[*xX×]\s*\d+(?:\.\d+)?\s*[*xX×]\s*\d+(?:\.\d+)?'
-                     r'(?:\s*(?:cm|mm|m|厘米|毫米|米))?(?![A-Za-z0-9_.-])', ' ', message, flags=re.I)
+                     r'(?:\s*(?:inches|inch|in|cm|mm|m|英寸|厘米|毫米|米|["″]))?(?![A-Za-z0-9_.-])', ' ', message, flags=re.I)
     message = re.sub(r'(?<![A-Za-z0-9_-])\d+(?:\.\d+)?\s*'
                      r'(?:kilograms?|kgs?|grams?|g|tons?|lbs?|磅|cbm|cm|mm|公斤|千克|克|吨|立方米|方|m[³3]|箱|件)'
                      r'(?![A-Za-z0-9_])', ' ', message, flags=re.I)
@@ -341,7 +311,7 @@ def is_tracking_request(message):
                r'(?:物流|轨迹|进度)(?:查询|查一下|查下))')
     personal = (r'(?:我的|(?:我)?(?:这|那)(?:票|个|单)|该)(?:货物?|包裹|快递|订单|运单)'
                 r'(?:现在|目前)?(?:到哪(?:里)?了?|什么时候(?:能|会)?到|何时能?到|多久能?到|'
-                r'签收了?(?:吗|没)|状态|进度|轨迹)(?:呢|吗|呀|啊)?')
+                r'(?:已)?(?:清关|开船|到港|出库|提柜)(?:了)?(?:吗|没|了吗|没有)?|签收了?(?:吗|没)|状态|进度|轨迹)(?:呢|吗|呀|啊)?')
     english = (r'(?:where\s+(?:is|are)\s+my|track(?:\s+my)?|check(?:\s+my)?)\s+'
                r'(?:parcels?|packages?|shipments?|orders?)(?:\s+(?:status|progress))?|'
                r'what\s+is\s+my\s+(?:parcel|package|shipment|order)\s+(?:status|progress)')
@@ -386,9 +356,9 @@ def answer_query(message, conv_id):
     if count_intent is not None:
         return answer_count_query(count_intent,tenants)
     if not references:
-        listed=answer_list_query(message,tenants)
+        listed=answer_list_query(message,tenants,conv_id)
         if listed is not None:return listed
-    mutation=bool(re.search(r'改址|修改.*(?:收件|地址|订单)|收件地址.*改|(?:取消|删除).*(?:订单|运单)|(?:订单|运单).*取消',message))
+    mutation=bool(re.search(r'改址|改.*(?:收货|收件).*地址|修改.*(?:收件|地址|订单)|(?:收货|收件)地址.*改|(?:取消|删除).*(?:订单|运单)|(?:订单|运单).*取消',message))
     if references and not tenants:
         return order_login_response()
     if len(references) > 1:
@@ -422,6 +392,8 @@ def answer_query(message, conv_id):
             return order_login_response() if not tenants else {'t':'当前支持查询订单与物流轨迹；改址、取消等操作请联系人工客服办理，尚未修改订单。请提供入仓码。'}
         if detail_question(message) and not is_lookup_help(message):
             return order_login_response() if not tenants else {'t':'请提供入仓码，我先核对该票订单的实际物流记录。'}
+        if re.search(r'哪些.*(?:订单|运单)|(?:订单|运单).*(?:筛选|还没开船|未发货|已发货|未签收)',message) and not is_lookup_help(message):
+            return order_login_response() if not tenants else {'t':'暂不支持按这个物流条件批量筛选订单。可按业务状态查看列表，或提供入仓码逐票核对实际物流节点。'}
         if is_tracking_request(message) or (not is_lookup_help(message) and re.search(r'(?:查|搜|看|找).*(?:订单|运单|物流轨迹|入仓码|入仓号)|(?:入仓码|入仓号).*(?:查|轨迹|状态)|订单状态|物流轨迹|shipment\s*id|'
                      r'(?:列出|搜索|所有|全部|多少|我的).*(?:订单|运单|入仓)|(?:订单|运单).*(?:多少|列表|查询|在哪|到哪|进度)|'
                      r'^\s*(?:查单|查询|查一下|帮我查一下)[。？！?!\s]*$|'

logistics_chat/order_explanations.py

@@ -7,7 +7,7 @@ def detail_question(message):
     if re.search(r'报价|运费|海派|海卡|\d+\s*(?:KG|公斤)',message,re.I) and not re.search(r'这票|该订单|我的订单',message):
         return False
     return bool(re.search(r'上架|没更新|未更新|没有更新|不更新|少了?.*(?:箱|件)|到了?几箱|逐箱|每箱.*签收|'
-                          r'已完成.*(?:签收|送达)|(?:签收|送达).*已完成|催单|催一下|拦截|'
+                          r'已完成.*(?:签收|送达)|(?:签收|送达).*已完成|催单|催一下|拦截|改.*(?:收货|收件).*地址|(?:收货|收件)地址.*改|快递单号|付过款|付款状态|'
                           r'(?:这票|该订单|我的货).*(?:发货|发走|出库|开船)',message))
 
 
@@ -24,6 +24,10 @@ def explain_order(message,row,card):
     lines=[f'入仓码 {reference}。' if row.get('inbound_code') else f'订单号 {reference}。']
     if re.search(r'催单|催一下|拦截',message):
         return lines[0]+'催单或拦截需联系人工客服办理；当前仅查询订单，尚未提交催单或拦截申请。'
+    if re.search(r'付过款|付款状态',message):
+        return lines[0]+'当前订单未接入付款状态，不能根据业务状态判断是否付款，请联系人工核对账单。'
+    if '快递单号' in message:
+        return lines[0]+'当前未记录可核实的UPS/FedEx尾程快递单号，入仓码和内部订单号不能直接当作快递单号，请联系人工核对。'
     lines.append(f'登记的业务状态为“{card["status"]}”。')
     actual=card.get('nodes',[]) if card.get('node_kind')=='logistics' else []
     if actual:

logistics_chat/order_listing.py

@@ -0,0 +1,69 @@
+"""Bounded conversational pagination over the server-validated customer scope."""
+
+import re
+import sqlite3
+
+from .db import connect
+
+
+def page_command(message):
+    text=re.sub(r'[\s，,。.!！?？]','',message)
+    match=re.fullmatch(r'(?:请)?(?:订单)?第(\d{1,5})页',text)
+    if match:return int(match.group(1))
+    if re.fullmatch(r'(?:请|继续)?(?:下一页|下页|继续显示|接着显示(?:剩下的)?订单)',text):return 'next'
+    if re.fullmatch(r'(?:请)?(?:上一页|上页)',text):return 'previous'
+    return None
+
+
+def answer_list(message,tenants,conv_id=None):
+    from .order_data import is_lookup_help,parse_count_query,tenant_filter,STATUS_LABELS
+    from .customer_service import order_login_response
+
+    command=page_command(message)
+    initial=(not is_lookup_help(message) and re.search(r'订单|运单|\borders?\b|\bshipments?\b',message,re.I)
+             and re.search(r'列出|列表|全部|所有|\blist\b',message,re.I))
+    if command is None and not initial:return None
+    if not tenants:return order_login_response()
+    page=1;status=None
+    if command is None:
+        intent=parse_count_query(re.sub(r'列出|列表|全部|所有|\blist\b','多少',message,flags=re.I))
+        if intent is None or intent['unsupported']:
+            return {'t':'暂不支持按这个条件列出订单。可查看全部订单或按履约中、已完成等业务状态查询。'}
+        status=intent['status']
+    scope=tenant_filter(tenant_ids=tenants)
+    if scope is None:return order_login_response()
+    connection=None
+    try:
+        connection=connect()
+        if command is not None:
+            if not conv_id:return {'t':'请先在当前对话中发送“列出我的订单”，再翻页查看。'}
+            prior=connection.execute("SELECT content FROM messages WHERE conv_id=? AND role='assistant' ORDER BY id DESC LIMIT 1",(conv_id,)).fetchone()
+            header=prior[0].split('\n',1)[0] if prior else ''
+            match=re.fullmatch(r'您当前的订单列表（.*第(\d+)页；业务状态：([^）]+)）：',header)
+            if not match:return {'t':'请先在当前对话中发送“列出我的订单”，再翻页查看。'}
+            labels={label:code for code,label in STATUS_LABELS.items()}
+            status=labels.get(match[2])
+            if match[2]!='全部' and status is None:return {'t':'请重新指定需要查看的订单状态。'}
+            page=int(command) if isinstance(command,int) else max(1,int(match[1])+(1 if command=='next' else -1))
+            if not 1<=page<=10000:return {'t':'请提供1至10000之间的有效页码。'}
+        where=' WHERE 1=1'+scope[0];values=scope[1]
+        if status:where+=' AND status=?';values=values+[status]
+        # Both reads see one current snapshot and apply exactly the same scope/filter.
+        connection.execute('BEGIN')
+        total=connection.execute('SELECT COUNT(*) FROM order_test_data'+where,values).fetchone()[0]
+        page=min(page,max(1,(total+19)//20))
+        rows=connection.execute('SELECT order_no,inbound_code,status,warehouse_code FROM order_test_data'+where+
+            ' ORDER BY id DESC LIMIT 20 OFFSET ?',values+[(page-1)*20]).fetchall()
+        if not rows:return {'t':'当前账号下没有符合条件的订单。','_customer_data':True}
+        label=STATUS_LABELS[status] if status else '全部'
+        first='先列出20票；' if page==1 and total>20 else ''
+        lines=[f'您当前的订单列表（{first}第{page}页；业务状态：{label}）：',f'共{total}票，当前显示第{(page-1)*20+1}至{(page-1)*20+len(rows)}票。']
+        for number,inbound,business_status,warehouse in rows:
+            lines.append(f'- 入仓码：{inbound or "未登记"}；订单号：{number}；业务状态：{STATUS_LABELS.get(business_status,business_status)}；目的仓：{warehouse or "未登记"}')
+        lines.append('回复“下一页”查看后续订单。' if page*20<total else '当前已是最后一页。')
+        lines.append('发送入仓码可查询该票订单和物流轨迹。')
+        return {'t':'\n'.join(lines),'_customer_data':True}
+    except sqlite3.Error:
+        return {'t':'订单信息暂时无法读取，请稍后重试。'}
+    finally:
+        if connection is not None:connection.close()

logistics_chat/pricing.py

@@ -147,6 +147,10 @@ def parse_shipping_intent(text):
         dl = re.search(r"长(\d+(?:\.\d+)?)宽(\d+(?:\.\d+)?)高(\d+(?:\.\d+)?)", t)
         if dl:
             intent["dims"] = [float(x) for x in dl.groups()]
+        else:
+            dl = re.search(r"(\d+(?:\.\d+)?)长(\d+(?:\.\d+)?)宽(\d+(?:\.\d+)?)高", t)
+            if dl:
+                intent["dims"] = [float(x) for x in dl.groups()]
 
     # 重量：带单位的数字。去掉空格后在原始文本上匹配，
     # 但不能把尺寸里的数字（如 120*100*100 的第三个数）当成重量
@@ -177,20 +181,22 @@ def parse_shipping_intent(text):
     return intent
 
 def detect_dim_unit(text):
-    """识别尺寸单位：cm（默认）/ m / mm"""
+    """Recognize explicit dimensions; aggregate CBM does not imply meters."""
     low = text.lower()
+    if re.search(r'英寸|\binch(?:es)?(?![A-Za-z])|\d\s*in(?![A-Za-z0-9])|\d\s*["″]',low):
+        return 'in'
     if re.search(r"毫米|\d\s*mm", low):
         return "mm"
-    if re.search(r"米", low) and not re.search(r"厘米", low):
-        return "m"
     if re.search(r"\d\s*cm|\d\s*厘米", low):
         return "cm"
-    if re.search(r"\d\s*m", low):          # 注意：cm 里也含 m，所以放在 cm 之后判断
+    if re.search(r"\d\s*(?:m(?![A-Za-z0-9²³])|米)", low):
         return "m"
     return "cm"
 
 def dims_to_cm(dims, unit):
     """统一换算成厘米，体积重公式按 cm 计算"""
+    if unit == 'in':
+        return [d * 2.54 for d in dims]
     if unit == "m":
         return [d * 100 for d in dims]
     if unit == "mm":

logistics_chat/quote_answers.py

@@ -7,9 +7,29 @@ from .quote_fees import document, amount, material_fee, limit_fees
 
 
 def answer_business(intent,book):
-    from .quote_engine import number
+    from .quote_engine import number,exact_number
 
     text=intent['text'];mode=intent.get('mode')
+    if mode=='weight_basis':
+        return '运费按计费重量计算，不是只看净重。实重按含包装的毛重，与材积重取较大值；美国海派材积重为长×宽×高(cm)÷6000，每箱不足12KG按12KG计费。海卡包税按对应公斤规则，不包税按方方案以实际体积和毛重÷363取大；请按所选方案核算。'
+    if mode=='rounding':
+        weight=(f'若{exact_number(intent["weight"])}KG已是计费重，就按{exact_number(intent["weight"])}KG计算。' if intent.get('weight') else '')
+        return '美国海派按原小数计费，不向上取整；每箱不足12KG仍按12KG计费。'+weight+'计费重先按各箱实重与材积重取大，再按渠道对应的重量门槛匹配档位。海卡等其他方案的进位方式需另行核对。'
+    if mode=='mixing':
+        return '请分别提供各产品的品名、材质、数量、重量，以及是否带电、带磁、液体或粉末，并说明是否放在同一箱。需先核对各品类的承运与申报要求，再确认混装方案，不能仅凭“两种产品”判断可以混装。'
+    if mode=='metal_scope':
+        from .quote_fees import material_charge
+        from .quote_engine import quantity
+        per_kg=material_fee(book)
+        if per_kg is None:return '铁铝附加费只按铁铝货物的计费重收取，当前未匹配到费率，请联系人工核对。'
+        lines=[f'铁铝附加费为{per_kg:g}元/KG，只按铁铝货物的计费重收取；一票只有部分铁铝货物时，不按整票计费重加收。']
+        unit='cbm' if intent.get('tax')=='excluded' and intent.get('cbm') else 'kg'
+        rate={'kind':'truck' if intent.get('kinds')==['truck'] else 'parcel','unit':unit,'service':''}
+        details=material_charge(intent,quantity(intent,rate),unit,book)
+        lines+=details['items']+details['notes']
+        if intent.get('metal_scope')!='partial' and details['items'] and not intent.get('dims'):
+            lines.append('以上按当前提供的重量条件估算，仍需核对各箱尺寸及材积重。')
+        return '\n'.join(dict.fromkeys(lines))
     if mode=='currency':
         return '当前海卡、海派运价中的“元/KG”和“元/CBM”按人民币（RMB/CNY）计；一件代发等资料中标注“$”“USD”“美金”的费用按美元计。不同币种分别列明，未提供结算汇率时不自动换算。'
     if mode=='insurance':
@@ -74,10 +94,17 @@ def answer_business(intent,book):
         return '请提供品名、材质、是否带电及所选渠道，先核对承运条件，再计算对应费用。'
     if mode=='fees':
         lines=[]
+        if re.search(r'含税|含派送|全包|包不包',text):
+            lines.append('报价行标注“包税”或“不包税”的方案按各自税费方式计算；海派的派送还需核对目的仓/邮编，住宅、商业地址及偏远等附加费不能直接当作已全部包含。')
         metal=material_fee(book)
         if metal is not None and re.search(r'铁制|钢制|铝制|铁铝|不锈钢',text):
-            lines.append(f'当前资料铁铝制品附加费为{metal:g}元/KG。')
-            if intent.get('weight'):lines.append(f'先按已提供重量{number(intent["weight"])}KG计算该项：{number(intent["weight"])}×{metal:g}={number(Decimal(intent["weight"])*metal)}元；计费重确定后继续核算。')
+            from .quote_fees import material_charge
+            from .quote_engine import quantity
+            unit='cbm' if intent.get('tax')=='excluded' and intent.get('cbm') else 'kg'
+            charge=quantity(intent,{'kind':'truck' if intent.get('kinds')==['truck'] else 'parcel','unit':unit,'service':''})
+            details=material_charge(intent,charge,unit,book)
+            lines.append(f'铁铝附加费为{metal:g}元/KG，只按铁铝货物的计费重收取。')
+            lines+=details['items']+details['notes']
         if re.search(r'超重|超尺寸|超长',text):
             raw=document(book,('超重收',))
             fee=amount(raw,r'超重收\s*[+＋]?\s*(\d+(?:\.\d+)?)')
@@ -93,6 +120,6 @@ def answer_business(intent,book):
             if remote is not None and extended is not None:
                 lines.append(f'当前美国海派资料：偏远地址加{remote:g}元/KG，超偏远地址加{extended:g}元/KG，遥远地址单询；海派每箱不足12KG按12KG计费。')
             lines.append('报价中的包税/不包税是不同费率口径；材质、报关申报、偏远及超重超尺寸等按条件单列，不代表所有服务费用都已包含。')
-            if metal is not None:lines.append(f'铁铝制品附加费{metal:g}元/KG；多项费用分别列明，同箱超限费用只取最高项。')
+            if metal is not None:lines.append(f'铁铝制品附加费{metal:g}元/KG，只按铁铝货物计费重收取；多项费用分别列明，同箱超限费用只取最高项。')
         return '\n'.join(lines)
     return None

logistics_chat/quote_context.py

@@ -28,6 +28,11 @@ def merge_intent(current,previous):
         if not current.get('allocations'):excluded.add('allocations')
     if current['dims']:excluded.add('cbm')
     if current['cbm'] is not None:excluded.add('dims')
+    if any(current.get(k) is not None for k in ('weight','dims','cbm','boxes','packages','allocations','transport','kinds','services','tax')) and current.get('metal_chargeable_weight') is None:
+        excluded.add('metal_chargeable_weight')
+    if current.get('material')=='ordinary':excluded.update(('metal_scope','metal_chargeable_weight'))
+    if current.get('metal_scope')=='all' and current.get('metal_chargeable_weight') is None:
+        excluded.add('metal_chargeable_weight')
     for key,value in previous.items():
         if result.get(key) is None and key not in excluded:result[key]=deepcopy(value)
     if current['dims'] is None and 'dims' not in excluded and previous['dims']:

logistics_chat/quote_edits.py

@@ -0,0 +1,14 @@
+"""Discard explicitly rejected quote conditions before parsing their replacements."""
+
+import re
+
+
+def clean_conditions(text):
+    rejected=r'(?:不是|不要|并非|不从)\s*(?:(?:发|寄|运|送)(?:到|往)?|去|到)?\s*'
+    value=(r'(?:[A-Za-z]{2,4}[0-9][A-Za-z0-9]{0,2})(?![A-Za-z0-9])|'
+           r'深圳|华南|东莞|义乌|华东|美西|美中|美东|美国|洛杉矶|纽约|铁制品|钢制品|铝制品|铁铝制品|金属制品')
+    return re.sub(rejected+'(?:'+value+')',' ',text,flags=re.I)
+
+
+def weight_comparison(text):
+    return bool(re.search(r'会不会按|是不是按|是否按|向上进位|小数公斤|计费.*(?:进位|取整)|公斤.*(?:进位|取整)',text))

logistics_chat/quote_engine.py

@@ -116,6 +116,17 @@ def number(value, places=2):
     return format(Decimal(value).quantize(Decimal(10)**-places, rounding=ROUND_HALF_UP), 'f').rstrip('0').rstrip('.') if places else str(value)
 
 
+def exact_number(value):
+    text=format(Decimal(value),'f')
+    return text.rstrip('0').rstrip('.') if '.' in text else text
+
+
+def quantity_number(value,intent):
+    if Decimal(value)==Decimal(intent.get('weight') or '0') or Decimal(value).as_tuple().exponent>=-6:
+        return exact_number(value)
+    return '约'+number(value,6)
+
+
 def render_rates(intent, book, destinations, remote_fees):
     from .quote_fees import charge_details
     from .quote_language import translate_quote
@@ -124,12 +135,14 @@ def render_rates(intent, book, destinations, remote_fees):
     if intent.get('mode')=='time':
         lines.append('美国线路参考时效：')
     elif intent['weight']:
-        lines.append(f"美国 {number(intent['weight'])}KG 基础运费：")
+        lines.append(f"美国 {exact_number(intent['weight'])}KG 基础运费：")
     else:
         lines.append('美国线路报价：')
     if intent.get('quantity_note'):lines.append(intent['quantity_note'])
     if intent.get('allocations'):
         lines.append('按各目的仓分票计算，箱规需逐票核对：')
+        if intent.get('metal_chargeable_weight') is not None:
+            lines.append('请分别提供各目的仓的铁铝货物计费重，整票铁铝基数不能重复套用到每个仓。')
     elif len(intent.get('warehouses') or [])>1:
         lines.append('以下按各目的仓分别比较；实际分票请提供每个仓的重量。')
     if intent.get('air_requested') and not intent.get('air_only'):
@@ -138,6 +151,8 @@ def render_rates(intent, book, destinations, remote_fees):
         part=destination.get('allocation')
         billing=({**intent,'weight':part['weight'],'packages':part.get('packages'),'dims':None,'cbm':None,'boxes':part.get('boxes')}
                  if part else intent)
+        if part and intent.get('metal_chargeable_weight') is not None:
+            billing.update(metal_chargeable_weight=None,metal_scope='partial')
         rates = match_rates(billing, book, destination)
         if intent.get('mode') in ('cheapest','fastest') and rates:
             if intent['mode']=='cheapest':
@@ -181,7 +196,7 @@ def render_rates(intent, book, destinations, remote_fees):
                     total = amount*price
                     details=charge_details(billing,rate,fees,book)
                     total+=details['cny']
-                    rate_text += f"，{number(amount,3)}{'KG' if unit == 'kg' else 'CBM'} = {number(total)}元"
+                    rate_text += f"，{quantity_number(amount,billing)}{'KG' if unit == 'kg' else 'CBM'} = {number(total)}元"
                     if details['items']:rate_text+='（'+ '；'.join(details['items'])+'）'
                     for note in details['notes']:
                         if note not in lines:lines.append(note)

logistics_chat/quote_fees.py

@@ -22,6 +22,35 @@ def material_fee(book):
     return amount(text,r'铁铝制品[^\n]*?[￥¥]\s*(\d+(?:\.\d+)?)\s*/KG')
 
 
+def material_charge(intent,charged,unit,book):
+    result={'cny':Decimal(0),'items':[],'notes':[]}
+    material=intent.get('material')
+    if material not in ('metal','unknown_metal'):return result
+    per_kg=material_fee(book)
+    if per_kg is None:
+        result['notes'].append('铁铝附加费费率尚未明确，当前金额未包含该项，请联系人工确认。')
+        return result
+    if material=='unknown_metal':
+        result['notes'].append('请先确认金属是否属于铁铝制品；铁铝附加费只按铁铝货物的计费重收取，当前金额未包含待核实的材质费用。')
+        return result
+    basis=intent.get('metal_chargeable_weight')
+    if basis is None and intent.get('metal_scope')=='partial':
+        result['notes'].append(f'铁铝附加费{per_kg:g}元/KG只按铁铝货物的计费重收取，不能按整票重量加费；请提供铁铝部分的计费重，当前金额未包含该项。')
+        return result
+    if basis is None and unit!='kg':
+        result['notes'].append(f'铁铝附加费为{per_kg:g}元/KG，当前按方运费未包含该项；需确认铁铝货物计费重量后单列，不能把CBM直接乘公斤附加费。')
+        return result
+    basis=Decimal(basis) if basis is not None else charged
+    if basis is None:return result
+    if unit=='kg' and charged is not None and basis>charged:
+        result['notes'].append('铁铝货物计费重高于当前整票可计算的计费重，请补充各箱实重和尺寸核对；当前金额未包含该项。')
+        return result
+    fee=basis*per_kg
+    result['cny']=fee
+    result['items'].append(f'铁铝附加费{per_kg:g}元/KG×{basis:g}KG={fee:g}元')
+    return result
+
+
 def specimens(intent):
     if intent.get('packages'):
         return [{**p,'dims':p.get('dims') or intent.get('dims'),
@@ -83,13 +112,8 @@ def charge_details(intent,rate,remote,book):
             fee=charged*Decimal(remote['fee']);result['cny']+=fee
             result['items'].append(f'偏远费{remote["fee"]}元/KG×{charged:g}KG={fee:g}元')
         else:result['notes'].append('遥远地址的附加费需单独确认，当前金额未包含该项。')
-    if intent.get('material')=='metal':
-        per_kg=material_fee(book)
-        if per_kg is not None and rate['unit']=='kg':
-            fee=charged*per_kg;result['cny']+=fee
-            result['items'].append(f'铁铝附加费{per_kg:g}元/KG×{charged:g}KG={fee:g}元')
-        elif per_kg is not None:
-            result['notes'].append(f'铁铝附加费为{per_kg:g}元/KG，当前按方运费未包含该项；需确认适用计费重量后单列，不能把CBM直接乘公斤附加费。')
+    metal=material_charge(intent,charged,rate['unit'],book)
+    result['cny']+=metal['cny'];result['items']+=metal['items'];result['notes']+=metal['notes']
     if rate['kind']=='parcel':
         limits=limit_fees(intent,book)
         result['cny']+=limits['cny'];result['items']+=limits['items'];result['notes']+=limits['notes']

logistics_chat/quote_intent.py

@@ -8,7 +8,7 @@ from .pricing import parse_shipping_intent, detect_dim_unit, shipping_region
 US = re.compile(r'美国|美西|美中|美东|洛杉矶|纽约|芝加哥|休斯顿|萨凡纳|'
     r'(?<![A-Za-z])(?:USA|(?-i:US)|United States|America)(?=$|[^A-Za-z]|FBA(?![A-Za-z]))|'
     r'(?:发(?:往|到)?|寄(?:往|到)?|运往|运到|到|往|\bto\s+)\s*us(?=$|[^A-Za-z]|FBA(?![A-Za-z]))',re.I)
-QUOTE_WORDS = re.compile(r'报价|价格|运费|费用|多少钱|计费|包税|海运|空运|海派|海卡|海铁|美森|合德|普船|附加|保险|代发|申报|偏远|超重|超尺寸|币种|\bEXX\b|\b(?:quote|price|cost|freight)\b',re.I)
+QUOTE_WORDS = re.compile(r'报价|价格|运费|费用|收费|多少钱|计费|包税|海运|空运|海派|海卡|海铁|美森|合德|普船|附加|保险|代发|申报|偏远|超重|超尺寸|币种|\bEXX\b|\b(?:quote|price|cost|freight)\b',re.I)
 WEIGHT = re.compile(r'(?<![\d.])(-?\d+(?:\.\d+)?)\s*(kilograms?|kgs?|公斤|千克|grams?|克|g|tons?|吨|lbs?|磅)(?![A-Za-z])',re.I)
 TOPIC_BOUNDARY = re.compile(r'新(?:的)?一(?:票|批)|另外|另一|换个话题|理赔|赔偿|破损|丢失|退件|投诉|查单|轨迹|签收')
 
@@ -31,7 +31,7 @@ def chinese_number(text):
 
 
 def normalize(text):
-    result=re.sub(r'([零〇一二两三四五六七八九十百千万点]+)(?=\s*(?:公斤|千克|克|吨|磅|箱|件|立方米|立方|方|kg|cbm))',
+    result=re.sub(r'([零〇一二两三四五六七八九十百千万点]+)(?=\s*(?:公斤|千克|克|吨|磅|(?:个)?箱|件|立方米|立方|方|kg|cbm))',
         lambda m:chinese_number(m.group(1)),text,flags=re.I)
     return re.sub(r'负(?=\d)','-',result)
 
@@ -48,14 +48,22 @@ def kg(value,unit):
 def request_mode(text):
     # Business topics outrank generic verbs such as “怎么算”.
     if re.search(r'保险|保价|投保|insured|insurance',text,re.I):return 'insurance'
+    from .quote_edits import weight_comparison
+    if weight_comparison(text):return 'rounding'
+    if re.search(r'毛重|净重|计费重.*(?:什么|区别)|材积重.*(?:什么|区别)',text):return 'weight_basis'
+    if re.search(r'混装|混箱|不同产品.*一箱',text):return 'mixing'
+    if (re.search(r'(?:铁|钢|铝|金属).*(?:附加|加费|加钱|整票)|整票.*(?:铁|钢|铝|金属)',text)
+            and not re.search(r'最终总价|一共多少钱|总共多少钱|合计多少钱|最终价格|最终费用|到门总价',text)):
+        return 'metal_scope'
     if re.search(r'纯电池|带电|内置电池|液体|粉末|食品|医疗用品|仿牌',text):return 'acceptance'
     from .shipping_faq import preparation_topic
     if preparation_topic(text):return 'preparation'
-    if re.search(r'最便宜|便宜的|最省钱|最划算|最低价|cheapest|least expensive',text,re.I):return 'cheapest'
+    if re.search(r'最便宜|便宜的|便宜一?点|优惠|折扣|打折|最省钱|最划算|最低价|cheapest|least expensive',text,re.I):return 'cheapest'
+    if re.search(r'最终总价|一共多少钱|总共多少钱|合计多少钱|最终价格|最终费用|到门总价',text):return 'total'
     if re.search(r'最快|快的|fastest',text,re.I):return 'fastest'
     if re.search(r'一件代发|散箱入库|整柜卸货|卸货费|仓租|仓储|贴标费',text):return 'fulfillment'
     if re.search(r'FDA|申报费|报关|续页|品名',text,re.I):return 'customs'
-    if re.search(r'附加费|还.*(?:费|加钱)|(?:额外|其他|其它).*(?:费用|收费)|包含.*费|包税.*(?:包含|包括)|超重费|超尺寸|住宅|私人|商业地址',text):return 'fees'
+    if re.search(r'附加费|含税|含派送|全包|包不包|还.*(?:费|加钱)|(?:额外|其他|其它).*(?:费用|收费)|包含.*费|包税.*(?:包含|包括)|超重费|超尺寸|住宅|私人|商业地址',text):return 'fees'
     if re.search(r'电池|带电|液体|粉末|食品|医疗|能(?:不能|发|走)|可以.*(?:发|走)',text):return 'acceptance'
     if re.search(r'人民币|美元|美金|币种|currency|\b(?:RMB|CNY|USD)\b',text,re.I) and not WEIGHT.search(text):return 'currency'
     if re.search(r'怎么(?:算|计算)|计算(?:过程|出来)|怎么算出来|calculation',text,re.I):return 'calculation'
@@ -65,27 +73,32 @@ def request_mode(text):
 
 def parse_intent(message,warehouse_codes):
     text=normalize(message)
+    from .quote_edits import clean_conditions
+    text=clean_conditions(text)
     text=re.sub(r'(?:而?不是|并非|不要按|不是按)\s*(?:每[箱件]|单[箱件])?\s*'+WEIGHT.pattern,' ',text,flags=re.I)
-    parsed=parse_shipping_intent(text)
+    from .quote_material import material_intent
+    materials=material_intent(text,WEIGHT,kg)
+    quantity_text=materials['quantity_text']
+    parsed=parse_shipping_intent(quantity_text)
     country='US' if US.search(text) else ('other' if shipping_region(text) is not None else None)
     candidates=re.findall(r'(?<![A-Za-z0-9])[A-Za-z][A-Za-z0-9]{2,7}(?![A-Za-z0-9])',text.upper())
     warehouses=list(dict.fromkeys(t for t in candidates if t in warehouse_codes))
     unknown=[t for t in candidates if t not in warehouse_codes and re.fullmatch(r'[A-Z]{2,4}[0-9][A-Z0-9]{0,2}',t)
              and not t.startswith(('USD','RMB','CNY'))]
-    errors=[]
+    errors=materials['errors'][:]
     from .quote_allocations import allocations
-    assigned=allocations(text,warehouses,WEIGHT,kg)
-    weights=[m for m in WEIGHT.finditer(text) if not text[:m.start()].rstrip().endswith(('x','X','×','*'))]
+    assigned=allocations(quantity_text,warehouses,WEIGHT,kg)
+    weights=[m for m in WEIGHT.finditer(quantity_text) if not quantity_text[:m.start()].rstrip().endswith(('x','X','×','*'))]
     weight=str(kg(*weights[0].groups())) if weights else None
-    boxes=re.search(r'(\d+)\s*(?:箱|件|cartons?|boxes?)',text,re.I)
+    boxes=re.search(r'(\d+)\s*(?:个)?(?:箱(?:子)?|件|cartons?|boxes?)',quantity_text,re.I)
     count=int(boxes.group(1)) if boxes else None
     packages=[]
     package_re=re.compile(r'(第)?(\d+)\s*(?:箱|件)\s*(?:[，,]?\s*每(?:箱|件))?\s*'+WEIGHT.pattern.replace(r'(?<![\d.])',''),re.I)
-    matches=list(package_re.finditer(text))
+    matches=list(package_re.finditer(quantity_text))
     package_dimensions={}
     for index,match in enumerate(matches):
         ordinal,n,value,unit=match.groups()
-        segment=text[match.end():matches[index+1].start() if index+1<len(matches) else len(text)]
+        segment=quantity_text[match.end():matches[index+1].start() if index+1<len(matches) else len(quantity_text)]
         dims=parse_shipping_intent(segment)['dims']
         packages.append({'count':1 if ordinal else int(n),'weight':str(kg(value,unit)),
                          'dims':dims,'dim_unit':detect_dim_unit(segment)})
@@ -93,7 +106,7 @@ def parse_intent(message,warehouse_codes):
     for part in assigned or []:
         for piece in part.get('packages') or []:
             piece.update(package_dimensions.get(piece.pop('position'),{}))
-    each=re.search(r'每(?:箱|件)\s*'+WEIGHT.pattern.replace(r'(?<![\d.])',''),text,re.I)
+    each=re.search(r'每(?:箱|件)\s*'+WEIGHT.pattern.replace(r'(?<![\d.])',''),quantity_text,re.I)
     if each and count and not packages:
         packages=[{'count':count,'weight':str(kg(*each.groups())),'dims':parsed['dims'],'dim_unit':detect_dim_unit(text)}]
     if packages:
@@ -103,16 +116,16 @@ def parse_intent(message,warehouse_codes):
             errors.append('箱数与分箱明细不一致，请确认总箱数及每箱重量。')
         count=package_count
         weight=str(sum(Decimal(p['weight'])*p['count'] for p in packages))
-        total=re.search(r'(?:总重|合计重量|一共重)\s*'+WEIGHT.pattern.replace(r'(?<![\d.])',''),text,re.I)
+        total=re.search(r'(?:总重|合计重量|一共重)\s*'+WEIGHT.pattern.replace(r'(?<![\d.])',''),quantity_text,re.I)
         if total and kg(*total.groups())!=Decimal(weight):errors.append('总重与分箱重量合计不一致，请确认。')
         # Per-carton dimensions must not spill onto another carton without dimensions.
         if len(packages)>1:parsed['dims']=None
     elif assigned:
         weight=str(sum(Decimal(a['weight']) for a in assigned))
         if set(a['warehouse'] for a in assigned)!=set(warehouses):errors.append('请分别提供每个目的仓的重量，避免遗漏分票。')
-        total=re.search(r'(?:总重|合计重量)\s*'+WEIGHT.pattern,text,re.I)
+        total=re.search(r'(?:总重|合计重量)\s*'+WEIGHT.pattern,quantity_text,re.I)
         if total and kg(*total.groups())!=Decimal(weight):errors.append('总重与各目的仓分配重量不一致，请确认。')
-    elif len(weights)>1:
+    elif len(weights)>1 and request_mode(text)!='rounding':
         errors.append('请明确总重，或分别提供每箱重量，避免把不同重量混在一起。')
     if assigned and packages and Decimal(weight)!=sum(Decimal(a['weight']) for a in assigned):
         errors.append('分仓重量与分箱重量不一致，请分别确认每仓的箱数和重量。')
@@ -149,8 +162,8 @@ def parse_intent(message,warehouse_codes):
         'unknown_warehouses':unknown or None,'postal':postal,'zone':zones[0] if zones else None,'zones':zones or None,
         'tax':'excluded' if re.search(r'不包税|自税|不含税|tax excluded',text,re.I) else ('included' if re.search(r'包税|tax included',text,re.I) else None),
         'errors':errors,'mode':request_mode(text),'english':True if english else (False if re.search(r'[\u4e00-\u9fff]',message) else None),
-        'material':('ordinary' if re.search(r'普通货|普货|塑料|木制|非铁铝',text) else
-                    ('metal' if re.search(r'铁制|钢制|铝制|铁铝|不锈钢',text) else None)),
+        'material':materials['material'],'metal_scope':materials['metal_scope'],
+        'metal_chargeable_weight':materials['metal_chargeable_weight'],
         'address_type':('non_fba' if re.search(r'私人|住宅|商业地址|非亚马逊',text) else ('fba' if warehouses else None)),
         'preserve_total':True if re.search(r'总重不变|重量不变',text) else None,'text':text}
 
@@ -166,4 +179,4 @@ def is_followup(message,intent):
     if intent.get('mode')!='quote':return not (intent['country'] and intent['weight'])
     if re.fullmatch(r'(?:邮编|zip|postcode)?\s*\d{5}(?:-\d{4})?(?:呢)?',text,re.I):return True
     if re.fullmatch(r'(?:义乌|华东|深圳|华南|美国|美西|美中|美东|东[12]区|西[12]区|中[12]区|不包税|包税)(?:交仓|仓)?(?:呢)?',text):return True
-    return bool(len(text)<=60 and not (intent['country'] and intent['weight']) and any(intent.get(k) is not None for k in ('services','kinds','transport','weight','dims','cbm','tax','origin')))
+    return bool(len(text)<=60 and not (intent['country'] and intent['weight']) and any(intent.get(k) is not None for k in ('services','kinds','transport','weight','dims','cbm','tax','origin','zone','material','metal_scope','metal_chargeable_weight')))

logistics_chat/quote_material.py

@@ -0,0 +1,30 @@
+"""Separate metal chargeable-weight declarations from the shipment's gross weight."""
+
+import re
+from decimal import Decimal
+
+
+def material_intent(text,weight_pattern,to_kg):
+    declarations=re.sub(r'铁铝(?:附加费|加费|费用)','',text)
+    metal=bool(re.search(r'铁制|钢制|铝制|铁铝|不锈钢|(?:铁|钢|铝)(?:件|货|扣|罐|盒|板|管|架|材)',declarations))
+    generic='金属' in text
+    ordinary=bool(re.search(r'普通货|普货|非铁铝',text))
+    partial=bool(re.search(r'只有|部分|其中|有些|只是|一部分',text) or
+                 metal and re.search(r'塑料|木制|布料',text))
+    scope='partial' if partial and (metal or generic) else ('all' if re.search(r'全是|全部是|都是|整票是|货物是|换成|改成',text) and metal else None)
+    material=('ordinary' if '非铁铝' in text else 'metal' if metal else 'unknown_metal' if generic
+              else 'ordinary' if ordinary or re.search(r'塑料|木制',text) else None)
+    name=r'(?:铁铝|铁制品|钢制品|铝制品|铁件|钢件|铝件|金属)(?:部分|货物)?(?:的)?'
+    patterns=(name+r'\s*计费重(?:量)?\s*(?:为|是|[:：])?\s*'+weight_pattern.pattern,
+              name+r'\s*按\s*'+weight_pattern.pattern+r'\s*计费')
+    charged=None;cleaned=text;errors=[]
+    for pattern in patterns:
+        matches=list(re.finditer(pattern,text,re.I))
+        for match in matches:
+            value=to_kg(*match.groups())
+            if charged is not None and Decimal(charged)!=value:errors.append('铁铝货物的计费重不一致，请确认。')
+            charged=str(value);scope='partial'
+            if not 0<value<=1000000:errors.append('请提供大于0的有效铁铝货物计费重。')
+            cleaned=cleaned[:match.start()]+' '*(match.end()-match.start())+cleaned[match.end():]
+    return {'material':material,'metal_scope':scope,'metal_chargeable_weight':charged,
+            'quantity_text':cleaned,'errors':errors}

logistics_chat/quote_scope.py

@@ -0,0 +1,35 @@
+"""Keep unanswered US shipping questions outside legacy regional model knowledge."""
+
+import re
+
+from .db import connect
+from .quote_intent import US,QUOTE_WORDS,parse_intent,is_followup
+from .pricing import shipping_region
+
+
+def answer_us_fallback(message,conv_id):
+    if re.search(r'理赔|赔偿|索赔|破损|丢失|退件|投诉',message):return None
+    if re.search(r'换个话题|另外问',message):return None
+    from .quote_edits import clean_conditions
+    current=clean_conditions(message)
+    active=bool(US.search(current))
+    if not active and shipping_region(current) is not None:return None
+    if not active and conv_id:
+        connection=connect()
+        try:
+            recent=connection.execute("SELECT content FROM messages WHERE conv_id=? AND role='user' ORDER BY id DESC LIMIT 10",(conv_id,)).fetchall()
+        finally:connection.close()
+        for (previous,) in recent:
+            previous=clean_conditions(previous)
+            if re.search(r'理赔|赔偿|破损|丢失|退件|投诉|查单|轨迹|签收|换个话题',previous):break
+            if US.search(previous):active=True;break
+            if shipping_region(previous) is not None:break
+            parsed=parse_intent(previous,set())
+            if not (QUOTE_WORDS.search(previous) or is_followup(previous,parsed)):break
+    if not active:return None
+    from .quote_data import load_book
+    if not load_book():return {'t':'当前尚未包含可用的美国报价表，请提供目的地仓码或邮编及货物信息，联系人工确认。'}
+    english=not re.search(r'[\u4e00-\u9fff]',message) and bool(re.search(r'[A-Za-z]{3,}',message))
+    if english:
+        return {'t':'Please specify the US route or destination warehouse/ZIP code and the point you want to confirm. Unlisted charges or service conditions require confirmation by customer support.'}
+    return {'t':'请说明您想确认的美国渠道、目的仓码或邮编，以及具体的费用或发货要求；未明确的服务条件需要联系人工核对。'}

logistics_chat/quote_service.py

@@ -73,19 +73,18 @@ def answer_quote(message, conv_id):
         dimensions += [piece['dims'] for piece in intent.get('packages') or [] if piece.get('dims')]
         if any(not 0 < value <= 100000 for dims in dimensions for value in dims):
             return {'t':'请提供大于 0 的有效长宽高。'}
+        if intent['air_only']:
+            return {'t':'当前美国报价资料包含美森、EXX、合德及普船的海卡、海铁和海派。发我目的仓码或邮编、重量，可以列出这些线路的价格；空运费率当前资料没有列出，空运承运条件也需单独确认。'}
         from .quote_answers import answer_business
         preparation=None
         if intent.get('mode')=='preparation':
             from .shipping_faq import answer_preparation
-            if intent['air_only']:return {'t':'当前美国资料未列明空运的交仓和发货要求，请确认具体空运渠道后联系人工核对。'}
             preparation=answer_preparation(intent,book)
             if preparation_topic(message)!='schedule' or not re.search(r'\d+\s*(?:KG|公斤|千克|克|吨|方|CBM)',intent['text'],re.I):
                 return {'t':preparation}
             intent['mode']='cheapest' if re.search(r'最便宜|最划算|最低价',message) else 'quote'
         business=answer_business(intent,book)
         if business is not None:return {'t':business}
-        if intent['air_only']:
-            return {'t':'当前美国报价资料包含美森、EXX、合德及普船的海卡、海铁和海派。发我目的仓码或邮编、重量，可以列出这些线路的价格；空运费率当前资料没有列出。'}
         destinations = variants(intent,book)
         fees = []
         for destination in destinations:
@@ -94,6 +93,10 @@ def answer_quote(message, conv_id):
                 return {'t':f'当前海派资料不接收邮编 {postal} 的地址，请提供其他目的仓码或联系人工确认可用线路。'}
             fees.append(postcode_fee(book['id'],postal) if postal else None)
         reply=render_rates(intent,book,destinations,fees)
+        if intent.get('mode')=='total':
+            reply+='\n以上为已提供条件下可计算的运费，各方案按所列包税/不包税方式分别核算；目的仓、箱规及未确定附加费需核实后才能确认最终应付总价。'
+        if intent.get('mode')=='cheapest' and re.search(r'便宜一?点|折扣|优惠|打折',message):
+            reply+='\n以上按当前价表比较，折扣或合作价格需人工确认，尚未修改单价。'
         return {'t':reply+('\n'+preparation if preparation else '')}
     except (sqlite3.Error, ValueError, KeyError, TypeError, InvalidOperation):
         return {'t':'报价数据暂时无法读取，请稍后重试。'}

logistics_chat/shipping_faq.py

@@ -7,9 +7,10 @@ def preparation_topic(text):
     if re.search(r'理赔|赔偿|索赔|货损|丢件|破损',text):return None
     if re.search(r'截仓|截单|船期|排仓|哪天开船|(?:什么时候|几号).*开船|能.*开船|'
                  r'(?:今天|明天|这周|下周).*(?:发货|发走|开船)|赶得上|来得及|(?:保证|必须|月底).*到',text):return 'schedule'
-    if re.search(r'上门.*(?:提货|取货|收货|揽收)|提货服务|交仓地址|仓库地址|送哪个仓|仓库在哪|收货时间',text):return 'delivery'
-    if re.search(r'报关资料|清关资料|报关.*(?:准备|材料)|申报比例|低申报|怎么申报|如何申报|认证资料',text):return 'documents'
+    if re.search(r'上门.*(?:提货|取货|收货|揽收)|提货服务|交仓地址|仓库地址|仓.*(?:地址|电话|联系人|几点)|送哪个仓|仓库在哪|收货时间|\bpick\s*up\b|\bpickup\b',text,re.I):return 'delivery'
+    if re.search(r'报关资料|清关资料|报关.*(?:准备|材料)|申报比例|低申报|怎么申报|如何申报|认证资料|熏蒸',text):return 'documents'
     if re.search(r'查验.*(?:费|承担)|谁.*承担.*查验',text):return 'inspection'
+    if re.search(r'(?:东|西|中)[12](?:区)?.*(?:区别|分区|哪区)|分区.*(?:什么意思|怎么分)',text):return 'zones'
     if '一件代发' not in text and re.search(r'贴标|FBA标|标签|唛头|产地标|外箱.*贴|贴.*条码|made\s+in\s+china',text,re.I):return 'labels'
     if re.search(r'哪些渠道|哪些线路|什么渠道|能发哪些仓|支持.*仓|(?:能发|能走|可以发).*美国',text):return 'coverage'
     return None
@@ -23,10 +24,14 @@ def answer_preparation(intent,book):
     if topic=='coverage':
         services=list(dict.fromkeys(rate['service'] for rate in book['rates']))
         return '美国可查询的线路：'+ '、'.join(services)+'。请提供目的仓码或邮编、重量及交货仓，我再匹配具体可用线路。'
+    if topic=='zones':
+        return '东1、东2等是报价资料中的不同目的地区域，需要按目的仓码或邮编匹配；同一仓码存在多个分区记录时会分别列出。请提供目的仓码或邮编，我按现有记录核对。'
     if topic=='schedule':
         return '请提供计划交仓日期、交货仓和目的仓码。具体截仓、装柜和开船安排需联系人工核对；当前参考时效不能作为月底或指定日期必达的承诺。'
     if topic=='delivery':
         raw=document(book,('不提供上门提货服务',))
+        if intent.get('english'):
+            return ('The current US route sheet requires delivery to the designated warehouse and does not offer pickup. ' if raw else '')+'Please confirm the route and Yiwu or South China origin with customer support before delivery; warehouse address, contact and receiving hours need confirmation.'
         lines=[]
         if raw:lines.append('当前美国渠道资料要求客户自行送货至对应仓库，不提供上门提货服务。')
         lines.append('请确认所选渠道及义乌或华南交仓，仓库地址、联系人和收货时间请联系人工核对后再送仓。')
@@ -39,6 +44,9 @@ def answer_preparation(intent,book):
         if origin:lines.append('产品和包装还需有“Made in China”产地标识。')
         return '\n'.join(lines) or '请提供渠道和目的仓码，由人工核对外箱标签及代贴要求。'
     if topic=='documents':
+        if '熏蒸' in intent['text']:
+            raw=document(book,('熏蒸','备货阶段'))
+            return (raw.strip()+'\n' if raw else '')+'请确认是木制成品还是木质包装，并提供具体品名及渠道，核对是否需要熏蒸及证明材料后再安排发货。'
         if re.search(r'申报比例|低申报|怎么申报|如何申报',intent['text']):
             return '请提供品名、材质、用途、实际交易金额及销售链接，由业务核对申报资料。申报价需结合实际交易信息确认，不能按统一比例直接代算。'
         raw=document(book,('单独报关需提供资料',))

tests/test_customer_gap_fixes.py

@@ -0,0 +1,206 @@
+"""Oral-language, US-region isolation and scoped-page regressions using synthetic facts."""
+
+from decimal import Decimal
+from pathlib import Path
+import re
+import tempfile
+import unittest
+from unittest.mock import patch
+
+from logistics_chat import create_app,db
+from logistics_chat.order_data import import_records
+from logistics_chat.pricing import detect_dim_unit,dims_to_cm
+from logistics_chat.quote_data import import_snapshot
+from logistics_chat.quote_intent import parse_intent
+from logistics_chat.quote_engine import quantity
+from test_quotes import fixture_snapshot,frames
+
+
+class CustomerGapTests(unittest.TestCase):
+    def setUp(self):
+        folder=tempfile.TemporaryDirectory();self.addCleanup(folder.cleanup)
+        root=Path(folder.name)
+        self.app=create_app({'TESTING':True,'DATABASE':root/'data.db','UPLOAD_DIR':root/'uploads',
+            'BACKUP_DIR':root/'backups','LOG_DIR':root/'logs','DEEPSEEK_API_KEY':'',
+            'CUSTOMER_DEMO_TENANT_ID':'qa-a','RATE_LIMIT_PER_MIN':1000})
+        self.client=self.app.test_client();self.client.post('/api/visitor/session',json={'key':'1'*64})
+        book=fixture_snapshot()
+        book['warehouses'].append({'code':'YYY2','zone':'西1区','state':'AA','postal':'90001',
+            'address':'','source_sheet':'合成分区','source_cell':'A8'})
+        texts=['偏远地址加收4元/kg；超偏远地址加收6元/kg','铁铝制品另外加附加费￥5/KG',
+            '正常货物 0KG<单件重量<22KG 0CM<最长单边长度<120CM 0CM<第二边<75CM 最长边<260CM',
+            '超重收+70/件','客户自行交货，不提供上门提货服务',
+            '禁止运输的货物：纯电池、液体','需熏蒸的货物由客户在备货阶段自行完成']
+        book['documents']=[{'sheet':'合成渠道','cell':f'A{i+1}','text':text} for i,text in enumerate(texts)]
+        self.order={'tenant_id':'qa-a','order_no':'FOCUS20260001','inbound_code':'QAFOCUS20260001',
+            'country_code':'US','status':'COMPLETED','package_count':2,
+            'tracking_json':[{'code':'IN_TRANSIT','actual_at':'2026-10-01 10:00'}]}
+        with self.app.app_context():
+            c=db.connect();import_snapshot(c,book,activate=True)
+            import_records(c,[self.order,{**self.order,'tenant_id':'qa-b','order_no':'OTHER20260099','inbound_code':'QAOTHER20260099'}])
+            c.commit();c.close()
+
+    def conversation(self):return self.client.post('/api/new_chat').json['id']
+
+    def events(self,q,cid=None,client=None):
+        with patch('logistics_chat.ai_client.post_completion') as model:
+            result=frames((client or self.client).post('/stream_chat',json={'msg':q,'conv_id':cid}))
+            model.assert_not_called()
+        self.assertEqual(result[-1],{'d':1},result)
+        return result
+
+    def ask(self,q,cid=None):return self.events(q,cid)[0]['t']
+
+    def login(self):
+        self.assertTrue(self.client.post('/api/customer/login',json={'username':'admin','password':'123456'}).json['ok'])
+
+    def test_us_natural_questions_never_enter_old_regional_model_faqs(self):
+        cases=('你们这个报价是按毛重还是净重？','运费能便宜一点吗？','这个价格含税含派送吗？',
+               '一共多少钱，给我最终总价','这个物流服务范围具体怎么执行？')
+        for q in cases:
+            with self.subTest(q=q):
+                cid=self.conversation();self.ask('美国美西30KG，义乌普船海派',cid)
+                text=self.ask(q,cid)
+                self.assertNotIn('21KG',text);self.assertNotIn('250',text);self.assertNotIn('7元/KG',text)
+        text=self.ask('我想发点货到美国，怎么收费？')
+        self.assertIn('元/KG',text);self.assertIn('多少公斤',text)
+
+    def test_final_total_respects_tax_labels_and_keeps_unconfirmed_fees_separate(self):
+        cid=self.conversation();self.ask('美国美西2箱每箱15KG，40x30x20cm，义乌普船海派',cid)
+        text=self.ask('一共多少钱，给我最终总价',cid)
+        self.assertIn('30KG = 60元',text);self.assertIn('· 包税',text)
+        self.assertNotIn('价格不含税',text);self.assertIn('最终应付总价',text)
+        self.assertIn('折扣或合作价格需人工确认',self.ask('运费能便宜一点吗',cid))
+
+    def test_negative_warehouse_and_origin_edits_do_not_keep_rejected_values(self):
+        cid=self.conversation();self.ask('美国30KG发ZZZ1，深圳普船海派',cid)
+        text=self.ask('不是发ZZZ1，是YYY2',cid)
+        self.assertNotIn('ZZZ1',text);self.assertIn('YYY2',text)
+        text=self.ask('不要深圳，还是义乌交仓',cid)
+        self.assertIn('· 义乌',text);self.assertNotIn('· 华南',text)
+        text=self.ask('50KG呢',cid)
+        self.assertIn('YYY2',text);self.assertNotIn('ZZZ1',text);self.assertIn('美国 50KG',text)
+
+    def test_inches_convert_before_charge_weight_and_acceptance_limits(self):
+        intent=parse_intent('美国30KG，60x40x30英寸，1箱普船海派',set())
+        self.assertEqual(intent['dim_unit'],'in')
+        self.assertEqual(dims_to_cm([60,40,30],'in'),[152.4,101.6,76.2])
+        self.assertGreater(quantity(intent,{'kind':'parcel','unit':'kg'}),Decimal('190'))
+        text=self.ask('美国美西30KG，60x40x30英寸，1箱普船海派，义乌')
+        self.assertIn('人工确认是否接收',text)
+        for text in ('60x40x30 inches','60x40x30in','60x40x30"'):
+            with self.subTest(text=text):
+                self.assertEqual(detect_dim_unit(text),'in')
+                self.assertIn('人工确认是否接收',self.ask('美国美西30KG，'+text+'，1箱普船海派，义乌'))
+        self.assertEqual(detect_dim_unit('60x40x30，合计1立方米'),'cm')
+        self.assertEqual(detect_dim_unit('60x40x30，合计1m3'),'cm')
+        self.assertEqual(detect_dim_unit('1.2x0.8x0.6m呢'),'m')
+
+    def test_spoken_carton_and_dimensions_are_used_without_reasking(self):
+        intent=parse_intent('美国30KG一个箱子，60长40宽30高，怎么算？',set())
+        self.assertEqual(intent['boxes'],1);self.assertEqual(intent['dims'],[60,40,30])
+        text=self.ask('美国美西30KG一个箱子，60长40宽30高，义乌普船海派')
+        self.assertIn('最高项70元/件',text)
+        self.assertNotIn('请补充箱数',text)
+
+    def test_comparing_two_weights_is_not_treated_as_two_cartons(self):
+        cid=self.conversation();self.ask('美国30KG海派报价',cid)
+        text=self.ask('单箱12.5KG会不会按13KG收费？',cid)
+        self.assertIn('按原小数计费，不向上取整',text)
+        self.assertIn('12.5KG',text)
+        self.assertNotIn('请明确总重',text)
+
+    def test_confirmed_fractional_weight_and_partial_metal_basis_are_used(self):
+        self.assertIn('12.5KG = 25元',self.ask('美国美西1箱12.5KG，40x30x20cm，义乌普船海派'))
+        self.assertIn('12.3456KG = 24.69元',self.ask('美国美西1箱12.3456KG，40x30x20cm，义乌普船海派'))
+        cid=self.conversation()
+        text=self.ask('美国美西30KG，部分铁制品，义乌普船海派',cid)
+        self.assertIn('30KG = 60元',text);self.assertIn('不能按整票重量加费',text)
+        self.assertNotIn('30KG = 210元',text)
+        text=self.ask('铁铝部分计费重10KG',cid)
+        self.assertIn('美国 30KG',text);self.assertIn('30KG = 110元',text)
+        self.assertIn('×10KG=50元',text)
+        self.assertIn('30KG = 110元',self.ask('一共多少钱，给我最终总价',cid))
+        text=self.ask('改成40KG',cid)
+        self.assertIn('当前金额未包含该项',text);self.assertNotIn('×10KG',text)
+        text=self.ask('全部换成铁制品40KG',cid)
+        self.assertIn('40KG = 280元',text)
+
+    def test_unknown_metal_and_cbm_quotes_do_not_spread_partial_fee_over_the_whole_load(self):
+        text=self.ask('美国美西30KG，只是金属扣子，整票都按铁铝加费吗，义乌普船海派')
+        self.assertIn('只按铁铝货物的计费重',text);self.assertIn('确认金属是否属于铁铝',text)
+        text=self.ask('美国30KG发ZZZ1，1方不包税海卡，部分铁制品，铁铝部分计费重10KG，义乌')
+        self.assertIn('1CBM = 150元',text);self.assertIn('×10KG=50元',text)
+        self.assertIn('大于0',self.ask('美国30KG，部分铁制品，铁铝部分计费重-1KG，义乌海派'))
+        text=self.ask('美国20KG发ZZZ1，10KG发YYY2，部分铁制品，铁铝部分计费重10KG，义乌普船海派')
+        self.assertIn('不能重复套用到每个仓',text)
+        self.assertIn('20KG = 100元',text);self.assertIn('12KG = 24元',text)
+        self.assertNotIn('铁铝附加费5元/KG×10KG',text)
+
+    def test_booking_phone_invoice_and_file_capabilities_do_not_invent_workflows(self):
+        cases=(('就按刚才方案帮我下单','尚未创建订单'),('手机号能查吗','暂不支持手机号'),
+               ('你们可以开发票吗，开票加几个点','开票税点'),('付款账号发我一下','收款账号'),
+               ('可以月结吗','月结资格'),('帮我导出订单Excel','暂不提供订单Excel导出'),
+               ('Excel能直接读里面箱规报价吗','不会自动读取Excel'),
+               ('我换了个手机，之前聊天记录还在吗','不会自动同步恢复'))
+        for q,expected in cases:
+            with self.subTest(q=q):self.assertIn(expected,self.ask(q))
+        with patch('logistics_chat.order_data.lookup_order') as lookup:
+            self.assertIn('暂不支持手机号',self.ask('手机号19900000000能查吗'))
+            lookup.assert_not_called()
+        with self.app.app_context():
+            c=db.connect();self.assertEqual(c.execute('SELECT COUNT(*) FROM order_test_data').fetchone()[0],2);c.close()
+
+    def test_address_and_pickup_questions_are_not_prices_and_english_stays_english(self):
+        cid=self.conversation();self.ask('美国30KG海派报价',cid)
+        self.assertIn('地址、联系人和收货时间',self.ask('义乌仓具体地址是什么？几点可以送？',cid))
+        text=self.ask('Can you pick up my goods in Shenzhen for US sea freight?')
+        self.assertIn('does not offer pickup',text);self.assertNotIn('CNY/kg',text)
+        self.assertFalse(re.search(r'[\u4e00-\u9fff]',text))
+
+    def test_air_battery_question_does_not_apply_sea_battery_requirements(self):
+        text=self.ask('想走美国空运，包税带电的，有吗？')
+        self.assertIn('空运费率当前资料没有列出',text);self.assertNotIn('MSDS',text)
+        self.assertIn('备货阶段',self.ask('美国木制品需要熏蒸吗'))
+
+    def seed_pages(self):
+        with self.app.app_context():
+            c=db.connect();import_records(c,[{'tenant_id':'qa-a','order_no':f'PAGE2026{i:06d}',
+                'inbound_code':f'QAPAGE2026{i:06d}','status':'PROCESSING'} for i in range(1,26)])
+            c.commit();c.close()
+
+    def test_pages_use_fresh_authorized_count_and_preserve_filter_and_private_history(self):
+        self.seed_pages()
+        self.assertTrue(self.events('下一页')[0]['login_required'])
+        self.login();cid=self.conversation()
+        text=self.ask('列出我的全部订单',cid)
+        self.assertIn('共26票',text);self.assertEqual(text.count('- 入仓码：'),20)
+        self.assertNotIn('QAOTHER',text)
+        text=self.ask('下一页',cid)
+        self.assertIn('第2页',text);self.assertEqual(text.count('- 入仓码：'),6);self.assertIn('共26票',text)
+        self.assertIn('最后一页',self.ask('下一页',cid))
+        self.assertIn('第1页',self.ask('上一页',cid))
+        self.ask('列出履约中的订单',cid)
+        text=self.ask('下一页',cid)
+        self.assertIn('共25票',text);self.assertEqual(text.count('- 入仓码：'),5);self.assertNotIn('QAFOCUS',text)
+        self.assertIn('第1页',self.ask('第1页',cid))
+        self.client.post('/api/customer/logout')
+        self.assertEqual(self.client.get('/api/get_messages',query_string={'conv_id':cid}).json,[])
+
+    def test_page_commands_cannot_reuse_another_topic_or_unbounded_offset(self):
+        self.login();cid=self.conversation();self.ask('列出我的订单',cid)
+        self.assertIn('有效页码',self.ask('第0页',cid))
+        self.ask('列出我的订单',cid)
+        self.ask('美国30KG海派报价',cid)
+        self.assertIn('请先',self.ask('下一页',cid))
+
+    def test_clearance_followup_modification_and_unknown_payment_do_not_call_model(self):
+        self.assertTrue(self.events('我的订单已清关了吗')[0]['login_required'])
+        self.login();cid=self.conversation();self.events('QAFOCUS20260001',cid)
+        event=self.events('我的订单已清关了吗？',cid)[0]
+        self.assertEqual(event['card']['no'],'FOCUS20260001')
+        self.assertEqual(event['card']['tracking_status'],'海运途中')
+        self.assertIn('尚未修改订单',self.ask('帮我把收货地址改一下',cid))
+        self.assertIn('未接入付款状态',self.ask('这票订单付过款了吗',cid))
+        self.assertIn('不能直接当作快递单号',self.ask('这票对应的UPS快递单号是多少',cid))
+        self.assertIn('暂不支持按这个物流条件',self.ask('哪些订单还没开船',cid))