fix: 总会员只读展开子会员类型，修复club_id默认xq查错配置；dddhq不再写库补会员

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

jituan/services/huiyuan_bundle.py

@@ -79,6 +79,57 @@ def get_bundle_included_ids(club_id, bundle_huiyuan_id):
     )
 
 
+def _membership_club_candidates(yonghu_id, club_id=None, record_club_id=None):
+    """
+    会员/总会员子类型解析用的俱乐部候选（有序）。
+    Huiyuangoumai/Czjilu.club_id 历史上默认 xq，星之界用户落库为 xq 时不能盲信。
+    """
+    from jituan.constants import CLUB_ID_DEFAULT
+
+    record_cid = (record_club_id or '').strip()
+    request_cid = (club_id or '').strip()
+    user_cid = _resolve_user_club_id(yonghu_id, club_id=club_id)
+
+    candidates = []
+
+    def add(cid):
+        c = (cid or '').strip()
+        if c and c not in candidates:
+            candidates.append(c)
+
+    if record_cid and record_cid != CLUB_ID_DEFAULT:
+        add(record_cid)
+    add(request_cid)
+    add(user_cid)
+    if record_cid:
+        add(record_cid)
+    add(CLUB_ID_DEFAULT)
+    return candidates
+
+
+def resolve_bundle_included_ids(bundle_huiyuan_id, club_id=None, yonghu_id=None, record_club_id=None):
+    """按候选俱乐部解析总会员包含的子会员（只读，首个非空配置即返回）。"""
+    if not bundle_huiyuan_id:
+        return []
+    for cid in _membership_club_candidates(
+        yonghu_id, club_id=club_id, record_club_id=record_club_id,
+    ):
+        ids = get_bundle_included_ids(cid, bundle_huiyuan_id)
+        if ids:
+            return list(ids)
+    return []
+
+
+def _included_huiyuan_id_set(included_ids):
+    included_set = set()
+    for x in included_ids or []:
+        sx = normalize_huiyuan_id(x)
+        if sx:
+            included_set.add(sx)
+            included_set.add(sx.lstrip('0') or '0')
+    return included_set
+
+
 def _resolve_user_club_id(yonghu_id, club_id=None):
     """解析用户所属俱乐部（体验/正式同一套；总会员子类型依赖此值）。"""
     from jituan.constants import CLUB_ID_DEFAULT
@@ -96,10 +147,15 @@ def _resolve_user_club_id(yonghu_id, club_id=None):
 
 
 def _record_club_id(record, club_id=None):
-    cid = (getattr(record, 'club_id', None) or '').strip()
+    candidates = _membership_club_candidates(
-    if cid:
+        getattr(record, 'yonghu_id', ''),
-        return cid
+        club_id=club_id,
-    return _resolve_user_club_id(getattr(record, 'yonghu_id', ''), club_id=club_id)
+        record_club_id=getattr(record, 'club_id', None),
+    )
+    if candidates:
+        return candidates[0]
+    from jituan.constants import CLUB_ID_DEFAULT
+    return CLUB_ID_DEFAULT
 
 
 def is_bundle_huiyuan(huiyuan_id):
@@ -141,19 +197,16 @@ def user_has_huiyuan_access(yonghu_id, required_huiyuan_id, club_id=None):
     )
     if bundle_ids:
         req_set = {req, req.lstrip('0') or '0'}
-        effective_club = _resolve_user_club_id(yonghu_id, club_id)
         for rec in Huiyuangoumai.query.filter(yonghu_id=yonghu_id, huiyuan_id__in=bundle_ids):
             if not _record_valid(rec):
                 continue
-            cid = _record_club_id(rec, club_id) or effective_club
+            included = resolve_bundle_included_ids(
-            included = get_bundle_included_ids(cid, rec.huiyuan_id)
+                rec.huiyuan_id,
-            included_set = set()
+                club_id=club_id,
-            for x in included:
+                yonghu_id=yonghu_id,
-                sx = normalize_huiyuan_id(x)
+                record_club_id=rec.club_id,
-                if sx:
+            )
-                    included_set.add(sx)
+            if req_set & _included_huiyuan_id_set(included):
-                    included_set.add(sx.lstrip('0') or '0')
-            if req_set & included_set:
                 return True
 
     if _czjilu_grants_huiyuan_access(yonghu_id, req, club_id):
@@ -193,14 +246,13 @@ def _czjilu_grants_huiyuan_access(yonghu_id, required_huiyuan_id, club_id=None):
         if huiyuan_ids_match(hid, req):
             return True
         if is_bundle_huiyuan(hid):
-            included = get_bundle_included_ids(cid, hid)
+            included = resolve_bundle_included_ids(
-            included_set = set()
+                hid,
-            for x in included:
+                club_id=club_id,
-                sx = normalize_huiyuan_id(x)
+                yonghu_id=yonghu_id,
-                if sx:
+                record_club_id=getattr(order, 'club_id', None),
-                    included_set.add(sx)
+            )
-                    included_set.add(sx.lstrip('0') or '0')
+            if req_set & _included_huiyuan_id_set(included):
-            if req_set & included_set:
                 return True
     return False
 
@@ -282,7 +334,6 @@ def resolve_grab_pool_member_display(order_dict, yonghu_id, club_id=None, user_c
 def enrich_clumber_item(record, club_id=None):
     """老端 clumber：体验会员与正式会员返回格式完全一致（不暴露 is_trial）。"""
     daoqi_str = format_legacy_daoqi(record.daoqi_time)
-    cid = _record_club_id(record, club_id)
     item = {
         'huiyuanid': record.huiyuan_id,
         'huiyuan_id': record.huiyuan_id,
@@ -294,7 +345,12 @@ def enrich_clumber_item(record, club_id=None):
     if is_bundle_huiyuan(record.huiyuan_id):
         item['is_bundle'] = True
         item['bundle_huiyuan_id'] = record.huiyuan_id
-        item['included_huiyuan_ids'] = get_bundle_included_ids(cid, record.huiyuan_id)
+        item['included_huiyuan_ids'] = resolve_bundle_included_ids(
+            record.huiyuan_id,
+            club_id=club_id,
+            yonghu_id=record.yonghu_id,
+            record_club_id=record.club_id,
+        )
     return item
 
 
@@ -410,7 +466,12 @@ def _build_clumber_from_paid_czjilu(yonghu_id, club_id=None):
         if is_bundle_huiyuan(hid):
             base['is_bundle'] = True
             base['bundle_huiyuan_id'] = hid
-            base['included_huiyuan_ids'] = get_bundle_included_ids(cid, hid)
+            base['included_huiyuan_ids'] = resolve_bundle_included_ids(
+                hid,
+                club_id=club_id,
+                yonghu_id=yonghu_id,
+                record_club_id=getattr(order, 'club_id', None),
+            )
         _append_clumber_id_variants(items, seen, base, hid)
         _append_bundle_sub_clumber(items, seen, base)
     return items
@@ -429,15 +490,10 @@ def _finalize_clumber_for_legacy_client(items):
 def ensure_grab_pool_clumber(yonghu_id, club_id=None):
     """
     dddhq / dashouxinxi：只读 huiyuangoumai + 有效期内充值单 生成 clumber（体验=正式）。
-    不写库、不全量 sync；仅在无任何会员时尝试补最近已付单（防回调丢失）。
+    总会员展开子会员虚拟条目供老端 clumber 比对；不写库、不补开通。
     """
-    from jituan.services.member_recharge import repair_recent_paid_entitlements_if_missing
-
     effective_club = _resolve_user_club_id(yonghu_id, club_id)
     items = _build_user_clumber_core(yonghu_id, club_id=effective_club)
-    if not items:
-        repair_recent_paid_entitlements_if_missing(yonghu_id, limit=3)
-        items = _build_user_clumber_core(yonghu_id, club_id=effective_club)
     items = _merge_clumber_extra_items(
         items,
         _build_clumber_from_paid_czjilu(yonghu_id, club_id=effective_club),
@@ -448,8 +504,8 @@ def ensure_grab_pool_clumber(yonghu_id, club_id=None):
 
 def refresh_grab_pool_membership_state(yonghu_id, club_id=None):
     """
-    抢单池/打手资料：请求入口统一刷新会员状态（同步权益 + clumber）。
+    抢单池/打手资料：只读生成 clumber（含总会员子类型展开）。
-    供 /dingdan/ddhq、/yonghu/dashouxinxi、登录 clumber 调用。
+    供 /dingdan/ddhq、/yonghu/dashouxinxi、登录 clumber 调用；禁止写库补会员。
     """
     return ensure_grab_pool_clumber(yonghu_id, club_id=club_id)