优化连续追问的报价条件与订单指代

logistics_chat/order_data.py

@@ -340,6 +340,11 @@ def answer_query(message, conv_id):
         if overview is not None:return overview
         explanation=general_explanation(message)
         if explanation:return {'t':explanation}
+        from .order_followups import answer_followup
+        followup=answer_followup(message,tenants,conv_id)
+        if followup is not None:
+            if '_order_reference' not in followup:return followup
+            references=[followup['_order_reference']]
     count_intent = parse_count_query(message) if not references else None
     if count_intent is not None:
         return answer_count_query(count_intent,tenants,conv_id)
@@ -354,27 +359,29 @@ def answer_query(message, conv_id):
     reference = references[0] if references else None
     if not reference and conv_id and is_order_followup(message):
         from .db import connect
+        from .customer_faq import is_acknowledgement
         connection = connect()
         try:
-            recent = connection.execute('SELECT role,content FROM messages WHERE conv_id=? ORDER BY id DESC LIMIT 12', (conv_id,)).fetchall()
+            recent = connection.execute('SELECT role,content FROM messages WHERE conv_id=? ORDER BY id DESC', (conv_id,))
+            for role, content in recent:
+                if role == 'user':
+                    if is_acknowledgement(content):continue
+                    earlier_references = extract_reference(content)
+                    if earlier_references:
+                        reference = earlier_references[0] if len(earlier_references) == 1 else None
+                        break
+                    if not is_order_followup(content):
+                        break
+                if role == 'assistant' and content.startswith('__CARD__'):
+                    try:
+                        previous = json.loads(content[8:])
+                        if previous.get('kind') == 'order':
+                            reference = previous['no']
+                            break
+                    except (ValueError, KeyError, TypeError):
+                        pass
         finally:
             connection.close()
-        for role, content in recent:
-            if role == 'user':
-                earlier_references = extract_reference(content)
-                if earlier_references:
-                    reference = earlier_references[0] if len(earlier_references) == 1 else None
-                    break
-                if not is_order_followup(content):
-                    break
-            if role == 'assistant' and content.startswith('__CARD__'):
-                try:
-                    previous = json.loads(content[8:])
-                    if previous.get('kind') == 'order':
-                        reference = previous['no']
-                        break
-                except (ValueError, KeyError, TypeError):
-                    pass
     if not reference:
         if mutation:
             return order_login_response() if not tenants else {'t':'当前支持查询订单与物流轨迹；改址、取消等操作请联系人工客服办理，尚未修改订单。请提供入仓码。'}