阿龙电竞后端已经修复了提现问题，聊天问题,管式商家分红最新代码

dingdan/views.py

@@ -2665,7 +2665,7 @@ class ShangjiaPaifaView(APIView):
 
             # ----- 10. 利率（打手+管事分成，打手优先） -----
             from dingdan.utils import calc_shangjia_order_fencheng
-            dashou_fencheng, guanshi_fencheng = calc_shangjia_order_fencheng(jiage)
+            dashou_fencheng, guanshi_fencheng, guanshi_shangjia_fencheng = calc_shangjia_order_fencheng(jiage)
 
             # ----- 11. 生成订单ID -----
             def generate_dingdan_id():
@@ -2686,6 +2686,7 @@ class ShangjiaPaifaView(APIView):
                         jine=jiage,
                         dashou_fencheng=dashou_fencheng,
                         guanshi_fencheng=guanshi_fencheng,
+                        guanshi_shangjia_fencheng=guanshi_shangjia_fencheng,
                         zhiding_id=zhiding_uid if zhiding_dashou else '',
                         shangpin_id=0,
                         leixing_id=int(shangpin_type_id),
@@ -4153,7 +4154,7 @@ logger = logging.getLogger(__name__)
 
 
 from peizhi.models import ClubConfig
-from utils.chat_utils import establish_order_chat   # 【新增】导入聊天工具
+from utils.chat_utils import establish_order_chat_with_retry
 class QiangdanView(APIView):
     authentication_classes = [JWTAuthentication]
     permission_classes = [IsAuthenticated]
@@ -4164,6 +4165,7 @@ class QiangdanView(APIView):
         if not dingdan_id:
             return Response({'code': 400, 'msg': '订单ID不能为空'}, status=400)
 
+        chat_success = False
         try:
             with transaction.atomic():
                 # 1. 验证打手身份和状态
@@ -4237,8 +4239,8 @@ class QiangdanView(APIView):
                         return Response({'code': 400, 'msg': validation_result['message']})
                     self._execute_qiangdan(order, dashou_profile, request.user.yonghuid)
 
-                # ========== 【唯一改动】聊天建立方式 ==========
-                chat_success = establish_order_chat(dingdan_id)
+            # 事务提交后再建群/建聊，避免长耗时 HTTP 拖住行锁，并支持重试
+            chat_success = establish_order_chat_with_retry(dingdan_id)
 
             try:
                 update_dashou_daily_by_action(
@@ -6357,6 +6359,10 @@ class AdQiangZhiJieDan(APIView):
                         # 商家扩展表不存在，跳过商家更新
                         logger.warning(f"强制结单：商家{shangjia_id}扩展信息不存在，跳过商家更新")
 
+                if fadan_pingtai == 2 and jiedan_dashou_id:
+                    from dingdan.utils import settle_shangjia_order_guanshi_fenhong
+                    settle_shangjia_order_guanshi_fenhong(dingdan_obj, jiedan_dashou_id)
+
             # 11. 返回成功响应
             return Response({
                 'code': 0,