XingQue/Django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 抢单建聊与聊天订单摘要不返回订单价格

Browse Source
This commit is contained in:
XingQue
2026-07-30 06:13:54 +08:00
parent 148a35f04b
commit 3a9b275d0a
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
orders/views/chat.py
View File

@@ -551,7 +551,8 @@ class LianTongDingDanZhuangTaiPiLiangView(APIView):
d = order_to_chat_dict(order) d = order_to_chat_dict(order)
result[oid] = { result[oid] = {
'jieshao': d['jieshao'], 'jieshao': d['jieshao'],
'jine': d['jine'], # 聊天列表不回传订单价格
'jine': '',
'zhuangtai': d['zhuangtai'], 'zhuangtai': d['zhuangtai'],
'zhuangtaiText': d['zhuangtaiText'], 'zhuangtaiText': d['zhuangtaiText'],
} }

18
utils/chat_utils.py
View File

@@ -165,10 +165,12 @@ def check_pair_chat_permission(identity_type, uid, dashou_uid, partner_uid, part
def order_to_chat_dict(order): def order_to_chat_dict(order):
"""聊天侧订单摘要。金额不返回：老板/平台订单聊天页不得展示订单价格。"""
return { return {
'dingdan_id': order.OrderID, 'dingdan_id': order.OrderID,
'jieshao': order.Description or '', 'jieshao': order.Description or '',
'jine': str(order.Amount) if order.Amount is not None else '', # 故意不返回 jine，避免消息列表/订单条展示价格
'jine': '',
'beizhu': order.Remark or '', 'beizhu': order.Remark or '',
'zhuangtai': order.Status, 'zhuangtai': order.Status,
'zhuangtaiText': ORDER_STATUS_TEXT.get(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, 'counterpartId': counterpart_id,
'counterpartYonghuid': counterpart_yonghuid, 'counterpartYonghuid': counterpart_yonghuid,
'orderDesc': order_desc, 'orderDesc': order_desc,
'orderJine': str(order.Amount) if order.Amount is not None else '', # 聊天页顶栏/会话元数据不带订单价格
'orderJine': '',
'orderZhuangtai': order.Status, 'orderZhuangtai': order.Status,
'dashouGoEasyId': dashou_goeasy_id, 'dashouGoEasyId': dashou_goeasy_id,
'partnerGoEasyId': partner_goeasy_id or '', '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) logger.error('抢单建聊订阅失败 order=%s group=%s', order.OrderID, group_id)
return False return False
# 1. 打手发送初始化消息 # 1. 打手代发进群消息：禁止带订单金额/价格
init_msg_text = f"订单已接单，内容：{order.Description}，备注：{order.Remark}，游戏ID：{order.Nickname}" init_msg_text = (
f"订单已接单，内容：{order.Description or ''}，"
f"备注：{order.Remark or ''}，游戏ID：{order.Nickname or ''}"
)
success1 = _send_group_message( success1 = _send_group_message(
appkey, secret, group_id, dashou_goeasy_id, dashou_name, group_avatar, appkey, secret, group_id, dashou_goeasy_id, dashou_name, group_avatar,
init_msg_text, None, group_name=group_name, order_id=order.OrderID 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 init_msg_text, None, group_name=group_name, order_id=order.OrderID
) )
# 2. 派单方也发一条，确保商家/老板会话列表能立刻出现该群 # 2. 派单方也发一条，确保商家/老板会话列表能立刻出现该群（同样不带价格）
partner_msg = f"订单已被接单，请及时沟通。" partner_msg = "订单已被接单，请及时沟通。"
success2 = _send_group_message( success2 = _send_group_message(
appkey, secret, group_id, partner_goeasy_id, partner_name, partner_avatar, appkey, secret, group_id, partner_goeasy_id, partner_name, partner_avatar,
partner_msg, None, group_name=group_name, order_id=order.OrderID partner_msg, None, group_name=group_name, order_id=order.OrderID