From e051ab2e9b70e11c0fbfbf595aa85b12f2e3f817 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Fri, 30 Oct 2026 10:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E7=89=A9=E6=B5=81=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=92=8C=E9=A2=84=E8=AE=A1=E5=88=B0=E8=BE=BE=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=9A=84=E8=BF=9E=E7=BB=AD=E8=BF=BD=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logistics_chat/order_data.py | 15 ++++++++++-----
 tests/test_order_data.py     |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/logistics_chat/order_data.py b/logistics_chat/order_data.py
index eb15b25..810ad53 100644
--- a/logistics_chat/order_data.py
+++ b/logistics_chat/order_data.py
@@ -21,7 +21,7 @@ FIELD_LABELS = {'inbound':'入仓码', 'shipment':'Shipment ID', 'country':'目
                 'weight':'申报毛重', 'volume':'申报体积', 'role':'订单层级',
                 'parent':'父订单号', 'updated':'来源更新时间'}
 IDENTIFIER = re.compile(r'(?<![A-Za-z0-9_-])[A-Za-z0-9][A-Za-z0-9_-]{5,63}(?![A-Za-z0-9_-])')
-ORDER_DETAIL = r'状态|进度|轨迹|到哪|开船|到港|清关|提柜|还柜|签收|重量|毛重|体积|件数|箱数|目的地|目的国|目的仓|仓库|父订单|运费|费用|价格|几件|几箱|公斤|千克|多少钱'
+ORDER_DETAIL = r'状态|进度|轨迹|到哪|开船|到港|清关|提柜|还柜|签收|预计|什么时候|何时|多久|重量|毛重|体积|件数|箱数|目的地|目的国|目的仓|仓库|父订单|运费|费用|价格|几件|几箱|公斤|千克|多少钱'
 
 
 class OrderDataUnavailable(Exception):
@@ -196,11 +196,16 @@ def is_order_followup(message):
     if re.search(r'(?:这|那|该)(?:个|票|单|笔)|该订单|刚才|上一(?:票|单|个订单)', message):
         return True
     question = re.sub(r'[\s，,。.!！?？、：:]', '', message)
-    return bool(re.fullmatch(
-        r'(?:那|那么|还有|请问|请|查一下|看一下)?(?:它的|订单的)?'
-        r'(?:(?:(?:(?:物流|运输)?(?:状态|进度|轨迹)|重量|毛重|体积|件数|箱数|目的地|目的国|目的仓|仓库|父订单|运费|费用|价格)'
+    details = (
+        r'(?:(?:(?:物流|运输)?(?:状态|进度|轨迹)|重量|毛重|体积|件数|箱数|目的地|目的国|目的仓|仓库|父订单|运费|费用|价格)'
         r'(?:(?:是|有|为)?(?:多少|什么|怎么样|怎样|如何|哪个))?|(?:有)?(?:几件|几箱|多少公斤|多少千克|多少钱))'
-        r'(?:呢|吗|呀|啊)?|(?:到哪(?:里)?|开船|到港|清关|提柜|还柜|签收)(?:了)?(?:呢|吗|没|了吗|没有)?)', question))
+        r'(?:呢|吗|呀|啊)?')
+    tracking = (
+        r'(?:(?:到哪(?:里)?|开船|到港|清关|提柜|还柜|签收)(?:了)?(?:呢|吗|没|了吗|没有)?|'
+        r'(?:预计)?(?:什么时候|何时|多久)(?:能|会|可以)?(?:到|到达|到港|到仓|到货|送到)(?:呢|呀|啊)?|还要多久)')
+    return bool(re.fullmatch(
+        r'(?:那|那么|还有|请问|请|查一下|看一下|现在|目前)?(?:它的|订单的)?'
+        r'(?:'+details+'|'+tracking+')', question))
 
 
 def answer_query(message, conv_id):
diff --git a/tests/test_order_data.py b/tests/test_order_data.py
index 730873a..6bf0bfe 100644
--- a/tests/test_order_data.py
+++ b/tests/test_order_data.py
@@ -134,7 +134,8 @@ class OrderDataTests(unittest.TestCase):
         ]}], replace=True)
         cid = self.client.post('/api/new_chat').json['id']
         with patch('logistics_chat.ai_client.post_completion') as model:
-            for message in (self.record['order_no']+' 物流轨迹', '到哪里了？', '那到港了吗？', '这票签收了吗？', '轨迹呢？'):
+            for message in (self.record['order_no']+' 物流轨迹', '到哪里了？', '那到港了吗？', '这票签收了吗？',
+                            '轨迹呢？', '现在到哪了？', '什么时候到港？', '预计什么时候到？', '还要多久？'):
                 card = self.events(message, cid)[0]['card']
                 self.assertEqual(card['node_kind'], 'logistics')
                 self.assertEqual(card['tracking_status'], '船舶已离开起运港')