From 38fc52241f3787a45811e3b6e6ec4c2fa0a7cb45 Mon Sep 17 00:00:00 2001 From: XingQue Date: Wed, 8 Jul 2026 15:41:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20dddhq=20=E4=B8=8D=E5=86=8D=E6=8A=8A=20ya?= =?UTF-8?q?oqiuleixing=20=E6=94=B9=E6=88=90=200=EF=BC=8C=E5=8E=9F=E6=A0=B7?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=201+huiyuan=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 体验会员与正式同走 clumber 匹配；仅提现校验正式会员。 Co-authored-by: Cursor --- jituan/services/huiyuan_bundle.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jituan/services/huiyuan_bundle.py b/jituan/services/huiyuan_bundle.py index 6c78151..a3eae47 100644 --- a/jituan/services/huiyuan_bundle.py +++ b/jituan/services/huiyuan_bundle.py @@ -233,9 +233,8 @@ def pool_display_has_valid_member_for_order(order_dict, yonghu_id, club_id=None) def resolve_grab_pool_member_display(order_dict, yonghu_id, club_id=None, user_clumber=None): """ - 【仅 dddhq 适配老小程序，不改前端】 - 老端逻辑：yaoqiuleixing==1 时用 clumber.huiyuanid === huiyuan_id 判断； - 有对应未过期会员（体验=正式）→ 必须返回 yaoqiuleixing=0，否则显示「未开通会员」。 + dddhq：原样返回抢单要求类型 1/2 + 对应 huiyuan_id（不改写成 0）。 + 体验会员与正式会员同一套 clumber；老端用 clumber.huiyuanid 对订单 huiyuan_id。 """ grab_req = int(order_dict.get('GrabRequirement') or order_dict.get('yaoqiuleixing') or 0) membership_id = resolve_order_membership_id(order_dict) @@ -243,9 +242,7 @@ def resolve_grab_pool_member_display(order_dict, yonghu_id, club_id=None, user_c return grab_req, membership_id or '', True has_valid = pool_display_has_valid_member_for_order(order_dict, yonghu_id, club_id=club_id) - if has_valid: - return 0, '', True - return 1, membership_id or '', False + return 1, membership_id or '', has_valid def enrich_clumber_item(record):