From 89fa08e5de0810c4df671d3463de28edf555a340 Mon Sep 17 00:00:00 2001 From: XingQue Date: Wed, 22 Jul 2026 20:26:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=94=B6=E6=AC=BE=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=A0=A1=E9=AA=8C=E4=BB=BB=E4=BD=95=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=9C=89=E6=97=A0=E6=8E=A5=E5=8D=95=E4=B8=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=9D=87=E5=8F=AF=E6=94=B6=E6=AC=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- yonghu/tixian_shenhe_services.py | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/yonghu/tixian_shenhe_services.py b/yonghu/tixian_shenhe_services.py index 68e1f68..5fe99a1 100644 --- a/yonghu/tixian_shenhe_services.py +++ b/yonghu/tixian_shenhe_services.py @@ -45,22 +45,6 @@ logger = logging.getLogger('yonghu.tixian_shenhe') ORDER_STATUS_COMPLETED = 3 ORDER_STATUS_REFUNDED = 5 -# 订单「接单中/进行中」：抢单成功后写入；结算中(8)等其它状态一律不拦收款 -ORDER_STATUS_IN_SERVICE = 2 - - -def _has_in_service_order(yonghuid: str) -> bool: - """ - 收款专用：是否有「正在接待」的订单。 - 仅当该打手作为接单人、且订单状态=2（接单中）时返回 True。 - 结算中/待结单/退款审核/已完成/已退款等任何其它状态都不算。 - """ - if not yonghuid: - return False - return Dingdan.objects.filter( - jiedan_dashou_id=str(yonghuid), - zhuangtai=ORDER_STATUS_IN_SERVICE, - ).exists() LEIXING_RATE_KEY = { 1: '5', @@ -336,10 +320,8 @@ def validate_withdraw_eligibility(user_main, leixing, jine, balance_check_amount def validate_collect_eligibility(user_main, leixing): """ 收款前二次校验（tixiansq / 自动打款收款）。 - 订单限制（仅打手佣金1、押金5）： - - 有接单中订单(zhuangtai=2 且 jiedan_dashou_id=本人) → 不能收款 - - 其它任意订单状态（含结算中等）→ 不影响收款 - 其余规则（封禁、罚单等）不变。 + 不校验任何订单（有无接单中/未完成订单都不拦收款）。 + 仍校验身份、封禁、罚单等。 """ yonghuid = user_main.yonghuid @@ -355,8 +337,6 @@ def validate_collect_eligibility(user_main, leixing): return False, '您不是打手身份，无法收款' if dashou.zhanghaozhuangtai != 1: return False, '打手账号已被封禁，无法收款' - if _has_in_service_order(yonghuid): - return False, '您有接单中的订单，请完成后再收款' return True, '' if leixing == 5: @@ -366,8 +346,6 @@ def validate_collect_eligibility(user_main, leixing): return False, '您不是打手身份，无法收款' if dashou.zhanghaozhuangtai != 1: return False, '打手账号已禁用，无法收款' - if _has_in_service_order(yonghuid): - return False, '您有接单中的订单，请完成后再收款' self_fadan = Fadan.objects.filter(beichufa_id=yonghuid).exclude(zhuangtai__in=[2, 4]).exists() if self_fadan: return False, '您有未处理完毕的自身罚单，无法收款'