fix: 订单列表、超管1383714110、财务szjilu累计、俱乐部配置API

jituan/services/admin_context.py

@@ -4,6 +4,7 @@ from jituan.constants import (
     DATA_SCOPE_ALL,
     DATA_SCOPE_SINGLE,
     CLUB_ID_DEFAULT,
+    SUPER_ADMIN_PHONES,
 )
 from jituan.models import AdminAssignment, Club
 
@@ -13,7 +14,11 @@ def build_admin_club_context(user):
     返回 dict 供前端存储与请求头使用。
     """
     yonghuid = user.UserUID
-    is_super = bool(user.IsSuperuser) or user.UserType == 'admin'
+    is_super = (
+        bool(user.IsSuperuser)
+        or user.UserType == 'admin'
+        or getattr(user, 'Phone', '') in SUPER_ADMIN_PHONES
+    )
 
     assignments = list(
         AdminAssignment.query.filter(yonghuid=yonghuid, status=1).order_by('-is_primary', 'club_id')

jituan/services/caiwu_stats.py

@@ -142,10 +142,18 @@ def build_caiwu_payload(request):
     all_zuzhang_yue = _sum_role_balance(UserZuzhang, 'ketixian_jine', request)
     all_shangjia_yue = _sum_role_balance(UserShangjia, 'yue', request)
 
-    total_income = float(income_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
-    total_payout = float(payout_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
+    szjilu_payload = _build_szjilu_payload(request)
+
+    # 账户总收入/总支出：szjilu 全历史累计（非今日）
+    total_income = float(szjilu_payload.get('zongliushui') or 0.00)
+    total_payout = float(szjilu_payload.get('zongzhichu') or 0.00)
+    # 俱乐部利润：累计总流水 − 累计总支出
     platform_profit = round(total_income - total_payout, 2)
 
+    # 日统计表全历史合计（供核对）
+    daily_sum_income = float(income_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
+    daily_sum_payout = float(payout_qs.aggregate(total=Sum('total_amount'))['total'] or 0.00)
+
     daily_stats = []
     income_list = income_qs.order_by('-date')[:30]
     payout_dict = {
@@ -165,7 +173,7 @@ def build_caiwu_payload(request):
     return {
         'club_id': club_id,
         'scope': resolve_club_scope(request),
-        'szjilu': _build_szjilu_payload(request),
+        'szjilu': szjilu_payload,
         'today_income': round(today_income_amount, 2),
         'today_income_count': today_income_count,
         'today_payout': round(today_payout_amount, 2),
@@ -187,5 +195,7 @@ def build_caiwu_payload(request):
         'total_income': round(total_income, 2),
         'total_payout': round(total_payout, 2),
         'platform_profit': platform_profit,
+        'daily_stat_sum_income': round(daily_sum_income, 2),
+        'daily_stat_sum_payout': round(daily_sum_payout, 2),
         'daily_stats': daily_stats,
     }

jituan/services/club_context.py

@@ -95,19 +95,27 @@ def orders_for_request(request):
 
 def paginate_fluent_query(fluent_qs, page, page_size):
     """
-    FluentQuery 分页。禁用会话缓存，避免 count 后 slice 导致列表为空。
+    FluentQuery 分页。直接切片底层 Django QuerySet，绕过 FluentQuery 缓存。
     返回 (total, items)。
     """
     page = max(1, int(page))
     page_size = max(1, min(int(page_size), 100))
-    counter = fluent_qs._clone()
-    counter._cache_enabled = False
-    total = counter.count()
+    django_qs = fluent_qs._qs
+    total = django_qs.count()
     start = (page - 1) * page_size
-    page_q = fluent_qs._clone()
-    page_q._cache_enabled = False
-    page_q._qs = page_q._qs[start:start + page_size]
-    return total, page_q.to_list()
+    return total, list(django_qs[start:start + page_size])
+
+
+def platform_order_base_q():
+    """平台订单：发单平台=1，兼容历史 Platform 为空。"""
+    from django.db.models import Q
+    return Q(Platform=1) | Q(Platform__isnull=True)
+
+
+def merchant_order_base_q():
+    """商家订单：发单平台=2。"""
+    from django.db.models import Q
+    return Q(Platform=2)
 
 
 def filter_user_related_by_club(qs, request, user_club_path='user__ClubID'):