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):