fix: 组队群统一 group_订单ID，入队发消息并拉商家/老板

开组/入队订阅派单方；发送「已组队」；进聊与代理发消息在有组队时走订单群；队友可进群。

Co-authored-by: Cursor <cursoragent@cursor.com>

orders/views/chat.py

@@ -42,7 +42,7 @@ from utils.weixin_broadcast import WeixinBroadcastSender
 from utils.money import yuan_to_fen
 from utils.chat_utils import (
     _send_group_message, _subscribe_users_to_group, establish_order_chat,
-    prepare_order_group_chat, resolve_pair_group_id,
+    prepare_order_group_chat, resolve_pair_group_id, resolve_order_chat_group_id,
     parse_pair_from_group_id, resolve_pair_from_order, check_pair_chat_permission,
     query_pair_orders, order_to_chat_dict,
 )
@@ -205,7 +205,22 @@ def check_user_permission(identity_type, uid, order):
         except UserDashou.DoesNotExist:
             return False, '该用户不是打手'
         if order.PlayerID != uid:
-            return False, '你不是该订单的接单打手'
+            # 组队队友也可进订单组队群
+            try:
+                from orders.models import TeamMember, TeamRecruit
+                in_team = TeamMember.query.filter(
+                    order_id=order.OrderID,
+                    user_uid=uid,
+                    join_status=TeamMember.JOIN_ACTIVE,
+                ).exists()
+                recruit_ok = TeamRecruit.query.filter(
+                    order_id=order.OrderID,
+                    status__in=[TeamRecruit.STATUS_RECRUITING, TeamRecruit.STATUS_LOCKED],
+                ).exists()
+                if not (in_team and recruit_ok):
+                    return False, '你不是该订单的接单打手'
+            except Exception:
+                return False, '你不是该订单的接单打手'
 
     elif identity_type == 'shangjia':
         try:
@@ -248,13 +263,16 @@ class DaiLiQunLiaoXiaoXiView(APIView):
     def post(self, request):
         # ===== 1. 参数解析 =====
         order_id = request.data.get('orderId')
-        identity_type = request.data.get('identityType')  # dashou / shangjia / boss
+        identity_type = request.data.get('identityType')  # dashou / PlayerID / shangjia / boss
         sender_name = request.data.get('senderName', '')
         sender_avatar_raw = request.data.get('senderAvatar', '')
         message_type = request.data.get('messageType', 'text')
         message_text = request.data.get('text', '')
         order_payload = request.data.get('orderPayload', None)
 
+        if identity_type == 'dashou':
+            identity_type = 'PlayerID'
+
         logger.info(f"[群聊代理] 收到请求: orderId={order_id}, identityType={identity_type}, "
                     f"messageType={message_type}, text={message_text[:20]}...")
 
@@ -289,8 +307,8 @@ class DaiLiQunLiaoXiaoXiView(APIView):
             logger.error("[群聊代理] 我方 GoEasy AppKey 未配置")
             return Response({'code': 500, 'msg': '系统配置错误(APPKEY)'})
 
-        # ===== 6. 公共群信息（新单走配对群，与文赫一致） =====
-        real_group_id = resolve_pair_group_id(order) or f"group_{order.OrderID}"
+        # ===== 6. 有组队用 group_{订单}，否则配对群 =====
+        real_group_id = resolve_order_chat_group_id(order) or f"group_{order.OrderID}"
         group_name = (order.Description[:20] + '…') if order.Description and len(order.Description) > 20 else f"订单{order.OrderID}"
         sender_avatar = full_avatar(sender_avatar_raw) if sender_avatar_raw else full_avatar('')