fix: 考试会员判断与打手会员信息同步

This commit is contained in:
XingQue
2026-06-26 15:16:43 +08:00
parent 0b202722e6
commit aaf14264d8
2 changed files with 7 additions and 6 deletions

View File

@@ -7,6 +7,7 @@ import uuid
from django.utils import timezone
from jituan.services.admin_context import build_admin_club_context
from jituan.constants import CLUB_ID_DEFAULT, DATA_SCOPE_ALL
from jituan.models import (
Club,
@@ -103,8 +104,9 @@ def config_to_dict(row):
}
def user_has_active_member(yonghuid, club_id):
for r in Huiyuangoumai.query.filter(yonghu_id=yonghuid, club_id=club_id):
def user_has_active_member(yonghuid, club_id=None):
"""是否有任意有效会员(与 /yonghu/dashouxinxi 的 clumber 逻辑一致)。"""
for r in Huiyuangoumai.query.filter(yonghu_id=yonghuid):
if r.huiyuan_zhuangtai == 1 and not r.jiance_shifou_daoqi():
return True
return False

View File

@@ -761,10 +761,9 @@ class DashouXinxiAPIView(APIView):
).select_related()
for record in huiyuan_records:
# 检查会员是否过期
is_expired = record.jiance_shifou_daoqi()
# 只返回未过期的会员huiyuan_zhuangtai = 1
# 过期检测会同步更新 huiyuan_zhuangtai
if record.jiance_shifou_daoqi():
continue
if record.huiyuan_zhuangtai == 1:
huiyuan_list.append({
'huiyuanid': record.huiyuan_id,