diff --git a/users/tixian_shenhe_services.py b/users/tixian_shenhe_services.py index 09ac8ce..f0433f7 100644 --- a/users/tixian_shenhe_services.py +++ b/users/tixian_shenhe_services.py @@ -65,16 +65,9 @@ logger = logging.getLogger('yonghu.tixian_shenhe') ORDER_STATUS_COMPLETED = 3 ORDER_STATUS_REFUNDED = 5 -# 打手提现申请:以下状态不拦截(仅 jiedan_dashou_id=该用户 的订单) -DASHOU_WITHDRAW_APPLY_NON_BLOCKING_ORDER_STATUSES = ( - 1, # 待抢单 - 3, # 已完成 - 4, # 退款审核中 - 5, # 已退款 - 6, # 退款失败 - 7, # 指定中 - 8, # 结算中 -) +# 打手提现申请:仅 jiedan_dashou_id=该用户 且 zhuangtai=2(进行中) 才拦截 +# 1已下单 3已完成 4退款审核中 5已退款 6拒绝退款 7指定中 8结算中 —— 均不拦 +DASHOU_WITHDRAW_APPLY_BLOCKING_ORDER_STATUSES = (2,) LEIXING_RATE_KEY = { 1: '5', @@ -286,11 +279,10 @@ def _dashou_has_unfinished_orders(yonghuid): def _dashou_has_orders_blocking_withdraw_apply(yonghuid): - """打手提现申请专用:仅拦进行中(2)等与该用户关联的订单。""" + """打手提现申请:仅拦该用户接单的进行中(2)订单。""" return Order.query.filter( PlayerID=yonghuid, - ).exclude( - Status__in=DASHOU_WITHDRAW_APPLY_NON_BLOCKING_ORDER_STATUSES, + Status__in=DASHOU_WITHDRAW_APPLY_BLOCKING_ORDER_STATUSES, ).exists() @@ -349,8 +341,6 @@ def validate_withdraw_eligibility(user_main, leixing, jine): return False, '您不是打手身份,无法提现佣金', {} if dashou.zhanghaozhuangtai != 1: return False, '打手账号已被封禁,无法提现', {} - if dashou.zhuangtai != 1: - return False, '有订单进行中,请完成后提现', {} if dashou.jifen < 10: return False, '积分不足10分,请补充积分后提现', {} huiyuan_ok, huiyuan_msg = check_dashou_has_formal_huiyuan_for_withdraw(yonghuid) @@ -407,8 +397,6 @@ def validate_withdraw_eligibility(user_main, leixing, jine): return False, '您不是打手身份,无法提取押金', {} if dashou.zhanghaozhuangtai != 1: return False, '打手账号已禁用,无法提取押金', {} - if dashou.zhuangtai != 1: - return False, '您有订单进行中,请完成后提取押金', {} if dashou.jifen < 10: return False, '积分不足10分,请补充积分后提取押金', {} huiyuan_ok, huiyuan_msg = check_dashou_has_formal_huiyuan_for_withdraw(yonghuid)