From 3a9b275d0a074efbb7fbd670d627085f509ad7ad Mon Sep 17 00:00:00 2001
From: XingQue <kongxing634@gmail.com>
Date: Thu, 30 Jul 2026 06:13:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A2=E5=8D=95=E5=BB=BA=E8=81=8A?=
 =?UTF-8?q?=E4=B8=8E=E8=81=8A=E5=A4=A9=E8=AE=A2=E5=8D=95=E6=91=98=E8=A6=81?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=94=E5=9B=9E=E8=AE=A2=E5=8D=95=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orders/views/chat.py |  3 ++-
 utils/chat_utils.py  | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/orders/views/chat.py b/orders/views/chat.py
index dfe29b6..05891d8 100644
--- a/orders/views/chat.py
+++ b/orders/views/chat.py
@@ -551,7 +551,8 @@ class LianTongDingDanZhuangTaiPiLiangView(APIView):
                     d = order_to_chat_dict(order)
                     result[oid] = {
                         'jieshao': d['jieshao'],
-                        'jine': d['jine'],
+                        # 聊天列表不回传订单价格
+                        'jine': '',
                         'zhuangtai': d['zhuangtai'],
                         'zhuangtaiText': d['zhuangtaiText'],
                     }
diff --git a/utils/chat_utils.py b/utils/chat_utils.py
index ea01cd2..8843cf9 100644
--- a/utils/chat_utils.py
+++ b/utils/chat_utils.py
@@ -165,10 +165,12 @@ def check_pair_chat_permission(identity_type, uid, dashou_uid, partner_uid, part
 
 
 def order_to_chat_dict(order):
+    """聊天侧订单摘要。金额不返回：老板/平台订单聊天页不得展示订单价格。"""
     return {
         'dingdan_id': order.OrderID,
         'jieshao': order.Description or '',
-        'jine': str(order.Amount) if order.Amount is not None else '',
+        # 故意不返回 jine，避免消息列表/订单条展示价格
+        'jine': '',
         'beizhu': order.Remark or '',
         'zhuangtai': order.Status,
         'zhuangtaiText': ORDER_STATUS_TEXT.get(order.Status, ''),
@@ -249,7 +251,8 @@ def build_order_group_chat_payload(order, viewer_backend_identity, viewer_uid):
         'counterpartId': counterpart_id,
         'counterpartYonghuid': counterpart_yonghuid,
         'orderDesc': order_desc,
-        'orderJine': str(order.Amount) if order.Amount is not None else '',
+        # 聊天页顶栏/会话元数据不带订单价格
+        'orderJine': '',
         'orderZhuangtai': order.Status,
         'dashouGoEasyId': dashou_goeasy_id,
         'partnerGoEasyId': partner_goeasy_id or '',
@@ -444,8 +447,11 @@ def _handle_local_order(order, dashou_goeasy_id, dashou_name, dashou_avatar, app
         logger.error('抢单建聊订阅失败 order=%s group=%s', order.OrderID, group_id)
         return False
 
-    # 1. 打手发送初始化消息
-    init_msg_text = f"订单已接单，内容：{order.Description}，备注：{order.Remark}，游戏ID：{order.Nickname}"
+    # 1. 打手代发进群消息：禁止带订单金额/价格
+    init_msg_text = (
+        f"订单已接单，内容：{order.Description or ''}，"
+        f"备注：{order.Remark or ''}，游戏ID：{order.Nickname or ''}"
+    )
     success1 = _send_group_message(
         appkey, secret, group_id, dashou_goeasy_id, dashou_name, group_avatar,
         init_msg_text, None, group_name=group_name, order_id=order.OrderID
@@ -456,8 +462,8 @@ def _handle_local_order(order, dashou_goeasy_id, dashou_name, dashou_avatar, app
             init_msg_text, None, group_name=group_name, order_id=order.OrderID
         )
 
-    # 2. 派单方也发一条，确保商家/老板会话列表能立刻出现该群
-    partner_msg = f"订单已被接单，请及时沟通。"
+    # 2. 派单方也发一条，确保商家/老板会话列表能立刻出现该群（同样不带价格）
+    partner_msg = "订单已被接单，请及时沟通。"
     success2 = _send_group_message(
         appkey, secret, group_id, partner_goeasy_id, partner_name, partner_avatar,
         partner_msg, None, group_name=group_name, order_id=order.OrderID